[pkg-java] r10210 - trunk/jajuk/debian

Varun Hiremath varun at alioth.debian.org
Mon Aug 31 02:12:27 UTC 2009 

Author: varun
Date: 2009-08-31 02:12:27 +0000 (Mon, 31 Aug 2009)
New Revision: 10210

Modified:
   trunk/jajuk/debian/MANIFEST.MF
   trunk/jajuk/debian/changelog
   trunk/jajuk/debian/control
   trunk/jajuk/debian/orig-tar.sh
   trunk/jajuk/debian/rules
   trunk/jajuk/debian/watch
Log:
* New upstream release
* debian/control:
  - Use libjhlabs-filters-java instead of libpixels-java
  - Bump Standards-Version to 3.8.3
* debian/MANIFEST.MF: replace pixels with jhlabs-filters
* debian/rules: replace pixels with jhlabs-filters in DEB_JARS
* Fix debian/watch file
* debian/orig-tar.sh: track only the latest maintenance branch

Modified: trunk/jajuk/debian/MANIFEST.MF
===================================================================
--- trunk/jajuk/debian/MANIFEST.MF	2009-08-30 22:27:33 UTC (rev 10209)
+++ trunk/jajuk/debian/MANIFEST.MF	2009-08-31 02:12:27 UTC (rev 10210)
@@ -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 pixels.jar lastfm.jar commons-io.jar commons-lang.jar xstream.jar jna.jar
+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 commons-lang.jar xstream.jar jna.jar
 Specification-Title: Jajuk

Modified: trunk/jajuk/debian/changelog
===================================================================
--- trunk/jajuk/debian/changelog	2009-08-30 22:27:33 UTC (rev 10209)
+++ trunk/jajuk/debian/changelog	2009-08-31 02:12:27 UTC (rev 10210)
@@ -1,3 +1,16 @@
+jajuk (1.8.1+svn5138-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control:
+    - Use libjhlabs-filters-java instead of libpixels-java
+    - Bump Standards-Version to 3.8.3
+  * debian/MANIFEST.MF: replace pixels with jhlabs-filters
+  * debian/rules: replace pixels with jhlabs-filters in DEB_JARS
+  * Fix debian/watch file
+  * debian/orig-tar.sh: track only the latest maintenance branch
+
+ -- Varun Hiremath <varun at debian.org>  Sun, 30 Aug 2009 22:09:13 -0400
+
 jajuk (1.8~svn5030-1) unstable; urgency=low
 
   [ Damien Raude-Morvan ]
@@ -14,7 +27,7 @@
   * debian/MANIFEST.MF:
     - Update like DEB_JARS + remove jdic.jar + add jna.jar
   * Update all patches to new release
-  * Add a new substance.diff patch for Substance 5.2 compatibility 
+  * Add a new substance.diff patch for Substance 5.2 compatibility
   * Rework jajuk.sh launch script:
     - Use java-wrappers for finding a suitable JAVA_HOME (Java6)
     - Move old $HOME/.jajuk_test_{1.7,1.8} to $HOME/.jajuk

Modified: trunk/jajuk/debian/control
===================================================================
--- trunk/jajuk/debian/control	2009-08-30 22:27:33 UTC (rev 10209)
+++ trunk/jajuk/debian/control	2009-08-31 02:12:27 UTC (rev 10210)
@@ -4,15 +4,15 @@
 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 drazzib.com>
 Build-Depends: cdbs, debhelper (>= 5), quilt
-Build-Depends-Indep: ant, libjgoodies-animation-java, libbasicplayer-java, libcobra-java, libcommons-codec-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-logging-java, entagged, libjaudiotagger-java (>= 1.0.9), libjcommon-java, libjfreechart-java, libjlayer-java, libjmac-java, libjorbis-java, libjspeex-java, liblog4j1.2-java, libmp3spi-java, substance, libswingx-java, libtritonus-java, libvldocking-java, libvorbisspi-java, mplayer, openjdk-6-jdk, libdbus-java, libmiglayout-java, libjna-java, libpixels-java, liblastfm-java, libcommons-lang-java, libcommons-io-java, libxstream-java
-Standards-Version: 3.8.2
+Build-Depends-Indep: ant, libjgoodies-animation-java, libbasicplayer-java, libcobra-java, libcommons-codec-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-logging-java, entagged, libjaudiotagger-java (>= 1.0.9), libjcommon-java, libjfreechart-java, libjlayer-java, libjmac-java, libjorbis-java, libjspeex-java, liblog4j1.2-java, libmp3spi-java, substance, libswingx-java, libtritonus-java, libvldocking-java, libvorbisspi-java, mplayer, openjdk-6-jdk, libdbus-java, libmiglayout-java, libjna-java, libjhlabs-filters-java, liblastfm-java, libcommons-lang-java, libcommons-io-java, libxstream-java
+Standards-Version: 3.8.3
 Homepage: http://jajuk.info/index.php/Main_Page
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jajuk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jajuk
 
 Package: jajuk
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre, libjgoodies-animation-java, libbasicplayer-java, libcobra-java, libcommons-codec-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-logging-java, entagged, libjaudiotagger-java (>= 1.0.9), libjcommon-java, libjfreechart-java, libjlayer-java, libjmac-java, libjorbis-java, libjspeex-java, liblog4j1.2-java, libmp3spi-java, substance, libswingx-java, libtritonus-java, libvldocking-java, libvorbisspi-java, liblaf-plugin-java, liblaf-widget-java, mplayer, libdbus-java, libmiglayout-java, libjna-java, libpixels-java, liblastfm-java, libcommons-lang-java, libcommons-io-java, libxstream-java, java-wrappers
+Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre, libjgoodies-animation-java, libbasicplayer-java, libcobra-java, libcommons-codec-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-logging-java, entagged, libjaudiotagger-java (>= 1.0.9), libjcommon-java, libjfreechart-java, libjlayer-java, libjmac-java, libjorbis-java, libjspeex-java, liblog4j1.2-java, libmp3spi-java, substance, libswingx-java, libtritonus-java, libvldocking-java, libvorbisspi-java, liblaf-plugin-java, liblaf-widget-java, mplayer, libdbus-java, libmiglayout-java, libjna-java, libjhlabs-filters-java, liblastfm-java, libcommons-lang-java, libcommons-io-java, libxstream-java, java-wrappers
 Description: advanced jukebox and music organizer
  Jajuk is software that organizes and plays music. Jajuk is designed
  to be intuitive, fast and provide multiple ways to perform the same

Modified: trunk/jajuk/debian/orig-tar.sh
===================================================================
--- trunk/jajuk/debian/orig-tar.sh	2009-08-30 22:27:33 UTC (rev 10209)
+++ trunk/jajuk/debian/orig-tar.sh	2009-08-31 02:12:27 UTC (rev 10210)
@@ -3,7 +3,7 @@
 # $1 version
 TAR=../jajuk_$1.orig.tar.gz
 DIR=jajuk-$1.orig
-VERSION=`echo $1 | sed -e 's/\+.*//g' | sed -e 's/\./_/g'`
+VERSION=`echo $1 | sed -e 's/[+~].*//g' | sed -e 's/\./_/g'`
 REVISION=`echo $1 | sed -e 's/.*svn//'`
 TAG=release-$VERSION
 
@@ -11,7 +11,9 @@
 mkdir $DIR
 mkdir $DIR/src
 (cd $DIR/src; \
-svn export -r $REVISION https://jajuk.svn.sourceforge.net/svnroot/jajuk/trunk/jajuk/src/main)
+svn export -r $REVISION https://jajuk.svn.sourceforge.net/svnroot/jajuk/branches/maintenance-1_8/src/main)
+# trunk version
+# svn export -r $REVISION https://jajuk.svn.sourceforge.net/svnroot/jajuk/trunk/jajuk/src/main
 GZIP=--best tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR
 rm -rf $DIR
 

Modified: trunk/jajuk/debian/rules
===================================================================
--- trunk/jajuk/debian/rules	2009-08-30 22:27:33 UTC (rev 10209)
+++ trunk/jajuk/debian/rules	2009-08-31 02:12:27 UTC (rev 10210)
@@ -8,7 +8,7 @@
 JAVA_HOME		:= /usr/lib/jvm/java-6-openjdk
 DEB_ANT_BUILDFILE	:= debian/build.xml
 DEB_ANT_BUILD_TARGET	:= jar -Djajuk.version="$(VERSION)"
-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 pixels lastfm commons-lang commons-io xstream
+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
 
 install/jajuk::
 	install -m 755 -D debian/jajuk.sh $(DEB_DESTDIR)/usr/bin/jajuk

Modified: trunk/jajuk/debian/watch
===================================================================
--- trunk/jajuk/debian/watch	2009-08-30 22:27:33 UTC (rev 10209)
+++ trunk/jajuk/debian/watch	2009-08-31 02:12:27 UTC (rev 10210)
@@ -1,3 +1,3 @@
 version=3
-opts="uversionmangle=s/_/~/,dversionmangle=s/\+svn.*//" \
-http://sf.net/jajuk/ jajuk-sources-([\d\.]+).*.zip
+opts="uversionmangle=s/_/\./,dversionmangle=s/[+~]svn.*//" \
+http://jajuk.svn.sourceforge.net/viewvc/jajuk/tags/ release-([0-9_].*)/ debian debian/orig-tar.sh

More information about the pkg-java-commits mailing list