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

Varun Hiremath varun at alioth.debian.org
Sat Apr 10 23:48:53 UTC 2010 

Author: varun
Date: 2010-04-10 23:48:53 +0000 (Sat, 10 Apr 2010)
New Revision: 12085

Removed:
   trunk/jajuk/debian/patches/
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 release candidate -- 1.9 Killer Queen
* Add (Build-)Depends libsimple-validation-java
* Remove all patches/* -- merged upstream
* Fix watch file

Modified: trunk/jajuk/debian/MANIFEST.MF
===================================================================
--- trunk/jajuk/debian/MANIFEST.MF	2010-04-10 23:18:39 UTC (rev 12084)
+++ trunk/jajuk/debian/MANIFEST.MF	2010-04-10 23:48:53 UTC (rev 12085)
@@ -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 commons-lang.jar xstream.jar jna.jar js.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 js.jar simple-validation.jar
 Specification-Title: Jajuk

Modified: trunk/jajuk/debian/changelog
===================================================================
--- trunk/jajuk/debian/changelog	2010-04-10 23:18:39 UTC (rev 12084)
+++ trunk/jajuk/debian/changelog	2010-04-10 23:48:53 UTC (rev 12085)
@@ -1,3 +1,12 @@
+jajuk (1:1.9~RC2~svn5837-1) unstable; urgency=low
+
+  * New release candidate -- 1.9 Killer Queen
+  * Add (Build-)Depends libsimple-validation-java
+  * Remove all patches/* -- merged upstream
+  * Fix watch file
+
+ -- Varun Hiremath <varun at debian.org>  Sat, 10 Apr 2010 19:42:54 -0400
+
 jajuk (1:1.8.4-1) unstable; urgency=low
 
   * In accordance with upstream recommendation, revert to 1.8.4 tag

Modified: trunk/jajuk/debian/control
===================================================================
--- trunk/jajuk/debian/control	2010-04-10 23:18:39 UTC (rev 12084)
+++ trunk/jajuk/debian/control	2010-04-10 23:48:53 UTC (rev 12085)
@@ -4,7 +4,7 @@
 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>
 Build-Depends: cdbs, debhelper (>= 7)
-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 (>= 2.0.0), libjcommon-java, libjfreechart-java, libjlayer-java, libjmac-java, libjorbis-java, libjspeex-java, liblog4j1.2-java, libmp3spi-java, substance (>= 5.2), libswingx-java (>= 1:1.6), 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
+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 (>= 2.0.0), libjcommon-java, libjfreechart-java, libjlayer-java, libjmac-java, libjorbis-java, libjspeex-java, liblog4j1.2-java, libmp3spi-java, substance (>= 5.2), libswingx-java (>= 1:1.6), libtritonus-java, libvldocking-java, libvorbisspi-java, mplayer, default-jdk, libdbus-java, libmiglayout-java, libjna-java, libjhlabs-filters-java, liblastfm-java, libcommons-lang-java, libcommons-io-java, libxstream-java, libsimple-validation-java
 Standards-Version: 3.8.4
 Homepage: http://jajuk.info/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jajuk
@@ -12,7 +12,7 @@
 
 Package: jajuk
 Architecture: all
-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 (>= 2.0.0), libjcommon-java, libjfreechart-java, libjlayer-java, libjmac-java, libjorbis-java, libjspeex-java, liblog4j1.2-java, libmp3spi-java, substance (>= 5.2), libswingx-java (>= 1:1.6), 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, rhino
+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 (>= 2.0.0), libjcommon-java, libjfreechart-java, libjlayer-java, libjmac-java, libjorbis-java, libjspeex-java, liblog4j1.2-java, libmp3spi-java, substance (>= 5.2), libswingx-java (>= 1:1.6), 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, rhino, libsimple-validation-java
 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	2010-04-10 23:18:39 UTC (rev 12084)
+++ trunk/jajuk/debian/orig-tar.sh	2010-04-10 23:48:53 UTC (rev 12085)
@@ -4,16 +4,16 @@
 TAR=../jajuk_$1.orig.tar.gz
 DIR=jajuk-$1.orig
 VERSION=`echo $1 | sed -e 's/[+~].*//g' | sed -e 's/\./_/g'`
-#REVISION=`echo $1 | sed -e 's/.*svn//'`
-TAG=release-$VERSION
+REVISION=`echo $1 | sed -e 's/.*svn//'`
+#TAG=release-$VERSION
 
 # clean up the upstream tarball
 mkdir $DIR
 mkdir $DIR/src
 (cd $DIR/src; \
-svn export https://jajuk.svn.sourceforge.net/svnroot/jajuk/tags/$TAG/src/main)
+# svn export https://jajuk.svn.sourceforge.net/svnroot/jajuk/tags/$TAG/src/main)
 # trunk version
-# 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/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	2010-04-10 23:18:39 UTC (rev 12084)
+++ trunk/jajuk/debian/rules	2010-04-10 23:48:53 UTC (rev 12085)
@@ -7,7 +7,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 jhlabs-filters 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 simple-validation
 
 install/jajuk::
 	install -m 755 -D debian/jajuk.sh $(DEB_DESTDIR)/usr/bin/jajuk

Modified: trunk/jajuk/debian/watch
===================================================================
--- trunk/jajuk/debian/watch	2010-04-10 23:18:39 UTC (rev 12084)
+++ trunk/jajuk/debian/watch	2010-04-10 23:48:53 UTC (rev 12085)
@@ -1,3 +1,3 @@
 version=3
-opts="uversionmangle=s/_/\./g,dversionmangle=s/[+~]svn.*//" \
-http://jajuk.svn.sourceforge.net/viewvc/jajuk/tags/ release-([0-9_].*)/ debian debian/orig-tar.sh
+opts="uversionmangle=s/_/\./g;s/RC/~RC/g,dversionmangle=s/[+~]svn.*//" \
+http://jajuk.svn.sourceforge.net/viewvc/jajuk/tags/ release-([0-9_RC].*)/ debian debian/orig-tar.sh

More information about the pkg-java-commits mailing list