[jajuk] 06/06: update other debian/* for 1.10.9
Felix Natter
fnatter-guest at moszumanska.debian.org
Sun Mar 20 03:18:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
fnatter-guest pushed a commit to branch master
in repository jajuk.
commit 6cff134d01bc00e87314c7f8c2a085f286b56b31
Author: Felix Natter <fnatter at gmx.net>
Date: Sun Mar 20 04:12:50 2016 +0100
update other debian/* for 1.10.9
---
debian/MANIFEST.MF | 2 +-
debian/changelog | 10 +++++++---
debian/control | 26 ++++++++++++++------------
debian/jajuk.desktop | 1 +
debian/jajuk.sh | 4 ++--
debian/rules | 8 ++++----
6 files changed, 29 insertions(+), 22 deletions(-)
diff --git a/debian/MANIFEST.MF b/debian/MANIFEST.MF
index cc3d1b6..f8d20b4 100644
--- a/debian/MANIFEST.MF
+++ b/debian/MANIFEST.MF
@@ -1,5 +1,5 @@
Manifest-Version: 2.0
Main-Class: org.jajuk.Main
Created-By: Jajuk team
-Class-Path: animation.jar basicplayer.jar cobra.jar commons-codec.jar commons-collections3.jar commons-httpclient.jar commons-logging.jar entagged-tageditor.jar jaudiotagger.jar jcommon.jar jfreechart.jar jl.jar jmactritonusspi.jar jogg.jar jorbis.jar jspeex.jar laf-plugin.jar laf-widget.jar log4j-1.2.jar mp3spi.jar substance.jar swingx.jar tritonus_share.jar vldocking.jar vorbisspi.jar jajuk-help.jar jajuk-help_fr.jar dbus.jar miglayout.jar jhlabs-filters.jar lastfm.jar commons-io.jar c [...]
+Class-Path: animation.jar basicplayer.jar cobra.jar commons-codec.jar commons-collections3.jar commons-logging.jar jaudiotagger.jar jcommon.jar jfreechart.jar jl.jar jmactritonusspi.jar jogg.jar jorbis.jar jspeex.jar laf-plugin.jar laf-widget.jar log4j-1.2.jar mp3spi.jar substance.jar swingx.jar tritonus_share.jar vldocking.jar vorbisspi.jar jajuk-help.jar jajuk-help_fr.jar dbus.jar miglayout.jar jhlabs-filters.jar lastfm.jar commons-io.jar commons-lang.jar xstream.jar jna.jar js.jar gua [...]
Specification-Title: Jajuk
diff --git a/debian/changelog b/debian/changelog
index 35f56e7..3f8deb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-jajuk (1:1.9.6-10) UNRELEASED; urgency=medium
+jajuk (1:1.10.9+dfsg1-1) UNRELEASED; urgency=medium
- * Team upload.
+ [ tony mancill ]
* Moved the package to Git
+ [ Felix Natter ]
+ * New upstream release (Closes: #800999, #781119)
+ * move to substance-7.3/insubstantial (Closes: #801374)
+ *
- -- tony mancill <tmancill at debian.org> Tue, 13 Oct 2015 22:50:36 -0700
+ -- Felix Natter <fnatter at gmx.net> Sun, 13 Mar 2016 10:39:54 +0100
jajuk (1:1.9.6-9.1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 272ddf7..61f340c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,16 +4,16 @@ Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Varun Hiremath <varun at debian.org>,
Torsten Werner <twerner at debian.org>,
- Damien Raude-Morvan <drazzib at debian.org>
+ Damien Raude-Morvan <drazzib at debian.org>,
+ Felix Natter <fnatter at gmx.net>
Build-Depends: cdbs, debhelper (>= 9)
Build-Depends-Indep: ant,
- default-jdk (>= 1:1.6),
+ default-jdk,
entagged,
libbasicplayer-java,
libcobra-java,
libcommons-codec-java,
libcommons-collections3-java,
- libcommons-httpclient-java,
libcommons-io-java,
libcommons-lang-java,
libcommons-logging-java,
@@ -40,22 +40,22 @@ Build-Depends-Indep: ant,
libvorbisspi-java,
libxstream-java,
mplayer,
- substance (>= 5.2)
-Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-java/jajuk.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/jajuk.git
+ substance (>= 7.3),
+ libqdwizard-java
+Standards-Version: 3.9.7
+Vcs-Git: https://anonscm.debian.org/git/pkg-java/jajuk.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jajuk.git
Homepage: http://jajuk.info
Package: jajuk
Architecture: all
-Depends: default-jre (>= 1:1.6) | java6-runtime | java7-runtime,
+Depends: default-jre | java7-runtime | java8-runtime,
entagged,
java-wrappers,
libbasicplayer-java,
libcobra-java,
libcommons-codec-java,
libcommons-collections3-java,
- libcommons-httpclient-java,
libcommons-io-java,
libcommons-lang-java,
libcommons-logging-java,
@@ -71,8 +71,8 @@ Depends: default-jre (>= 1:1.6) | java6-runtime | java7-runtime,
libjna-java,
libjorbis-java,
libjspeex-java,
- liblaf-plugin-java,
- liblaf-widget-java,
+ liblaf-plugin-java (>= 7.3),
+ liblaf-widget-java (>= 7.3),
liblastfm-java (>= 1:0.1.0),
liblog4j1.2-java,
libmiglayout-java,
@@ -85,7 +85,9 @@ Depends: default-jre (>= 1:1.6) | java6-runtime | java7-runtime,
libvorbisspi-java,
libxstream-java,
mplayer,
- substance (>= 5.2),
+ substance (>= 7.3),
+ libqdwizard-java,
+ libtrident-java (>= 7.3),
${misc:Depends}
Description: advanced jukebox and music organizer
Jajuk is software that organizes and plays music. Jajuk is designed
diff --git a/debian/jajuk.desktop b/debian/jajuk.desktop
index 307ec60..6ea1814 100644
--- a/debian/jajuk.desktop
+++ b/debian/jajuk.desktop
@@ -6,3 +6,4 @@ Icon=jajuk.png
Terminal=false
Type=Application
Categories=AudioVideo
+Keywords=Jukebox; Music management; Organize music; advanced music collection
\ No newline at end of file
diff --git a/debian/jajuk.sh b/debian/jajuk.sh
index 846ed2b..4bf52b3 100755
--- a/debian/jajuk.sh
+++ b/debian/jajuk.sh
@@ -14,7 +14,7 @@ JAJUK_OPTS=""
# Include the wrappers utility script
. /usr/lib/java-wrappers/java-wrappers.sh
-# We need a java6 runtime
-find_java_runtime java6 java7
+# We need a java7 runtime
+find_java_runtime java7 java8
exec $JAVA_HOME/bin/java $JAVA_OPTS -jar /usr/share/java/jajuk.jar $JAJUK_OPTS "$@"
diff --git a/debian/rules b/debian/rules
index b900a16..5c79a38 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,18 +4,18 @@ include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/debhelper.mk
JAVA_HOME := $(firstword $(wildcard /usr/lib/jvm/default-java /usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH) /usr/lib/jvm/java-6-openjdk))
-DEB_ANT_BUILDFILE := src/scripts/build.xml
+DEB_ANT_BUILDFILE := build_enduser.xml
DEB_ANT_BUILD_TARGET := package_jar
DEB_ANT_ARGS := -Dbuild.time='$(shell dpkg-parsechangelog --show-field Date)'
-DEB_JARS := animation basicplayer cobra commons-codec commons-collections3 commons-httpclient commons-logging entagged-tageditor jaudiotagger jcommon jfreechart jl jmactritonusspi jogg jorbis jspeex log4j-1.2 mp3spi substance swingx tritonus_share vldocking vorbisspi jna dbus miglayout jhlabs-filters lastfm commons-lang commons-io xstream simple-validation guava
+DEB_JARS := animation basicplayer cobra commons-codec commons-collections3 commons-logging entagged-tageditor jaudiotagger jcommon jfreechart jl jmactritonusspi jogg jorbis jspeex log4j-1.2 mp3spi substance swingx tritonus_share vldocking vorbisspi jna dbus miglayout jhlabs-filters lastfm commons-lang commons-io xstream simple-validation guava
install/jajuk::
install -m 755 -D debian/jajuk.sh $(DEB_DESTDIR)/usr/bin/jajuk
- install -m 644 -D build/jajuk/bin/jajuk.jar $(DEB_DESTDIR)/usr/share/java/jajuk-$(DEB_UPSTREAM_VERSION).jar
+ install -m 644 -D bin/jajuk.jar $(DEB_DESTDIR)/usr/share/java/jajuk-$(DEB_UPSTREAM_VERSION).jar
dh_link /usr/share/java/jajuk-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jajuk.jar
install -m 644 -D src/main/resources/icons/16x16/jajuk-icon_16x16.png \
$(DEB_DESTDIR)/usr/share/pixmaps/jajuk.png
dh_install debian/jajuk.desktop /usr/share/applications/
get-orig-source:
- uscan --force-download
+ uscan --force-download --rename --repack
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jajuk.git
More information about the pkg-java-commits
mailing list