[pkg-java] r14201 - in trunk/libmp3spi-java/debian: . source

Tue Aug 16 13:25:36 UTC 2011

Author: twerner
Date: 2011-08-16 13:25:36 +0000 (Tue, 16 Aug 2011)
New Revision: 14201

Added:
   trunk/libmp3spi-java/debian/source/
   trunk/libmp3spi-java/debian/source/format
Modified:
   trunk/libmp3spi-java/debian/changelog
   trunk/libmp3spi-java/debian/control
   trunk/libmp3spi-java/debian/orig-tar.sh
   trunk/libmp3spi-java/debian/rules
   trunk/libmp3spi-java/debian/watch
Log:
UNRELEASED
* New upstream release
  - Change d/watch to download the ZIP file since upstream provides ZIP files
    only.
* Change Section: java.
* Switch to default-jdk.
* Clean up Depends.
* Update Standards-Version: 3.9.1.
* Switch to source format 3.0.
* Build tests now but don't run them. The actual tests need some data files
  that are not part of the source code.

Modified: trunk/libmp3spi-java/debian/changelog
===================================================================

--- trunk/libmp3spi-java/debian/changelog	2011-08-16 09:04:53 UTC (rev 14200)
+++ trunk/libmp3spi-java/debian/changelog	2011-08-16 13:25:36 UTC (rev 14201)
@@ -1,3 +1,19 @@
+libmp3spi-java (1.9.5-1) unstable; urgency=low
+
+  UNRELEASED
+  * New upstream release
+    - Change d/watch to download the ZIP file since upstream provides ZIP files
+      only.
+  * Change Section: java.
+  * Switch to default-jdk.
+  * Clean up Depends.
+  * Update Standards-Version: 3.9.1.
+  * Switch to source format 3.0.
+  * Build tests now but don't run them. The actual tests need some data files
+    that are not part of the source code.
+
+ -- Torsten Werner <twerner at debian.org>  Tue, 16 Aug 2011 15:05:55 +0200
+
 libmp3spi-java (1.9.4-3) unstable; urgency=low
 
   * Move the package to pkg-java svn.

Modified: trunk/libmp3spi-java/debian/control
===================================================================
--- trunk/libmp3spi-java/debian/control	2011-08-16 09:04:53 UTC (rev 14200)
+++ trunk/libmp3spi-java/debian/control	2011-08-16 13:25:36 UTC (rev 14201)
@@ -1,18 +1,19 @@
 Source: libmp3spi-java
-Section: libs
+Section: java
 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>
 Build-Depends: cdbs, debhelper (>= 5)
-Build-Depends-Indep: ant, java-gcj-compat-dev, libjlayer-java, libtritonus-java
-Standards-Version: 3.7.3
+Build-Depends-Indep: ant-optional, default-jdk, libjlayer-java, libtritonus-java,
+ junit
+Standards-Version: 3.9.1
 Homepage: http://www.javazoom.net/mp3spi/mp3spi.html
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libmp3spi-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libmp3spi-java
 
 Package: libmp3spi-java
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${misc:Depends}
 Description: interface to support MP3 (MPEG 1/2/2.5 Layer 1/2/3) audio format 
  MP3SPI is a Java Service Provider Interface that adds MP3 (MPEG
  1/2/2.5 Layer 1/2/3) audio format support for Java Platform. It

Modified: trunk/libmp3spi-java/debian/orig-tar.sh
===================================================================
--- trunk/libmp3spi-java/debian/orig-tar.sh	2011-08-16 09:04:53 UTC (rev 14200)
+++ trunk/libmp3spi-java/debian/orig-tar.sh	2011-08-16 13:25:36 UTC (rev 14201)
@@ -3,18 +3,18 @@
 # called by uscan with '--upstream-version' <version> <file>
 
 DIR=libmp3spi-java-$2.orig
+TAR=libmp3spi-java_$2.orig.tar.gz
 
 # clean up the upstream tarball
-tar -x -z -f $3
+unzip $3
 mv MpegAudioSPI$2 $DIR
-tar -c -z -f $3 --exclude '*.jar' --exclude '*/doc/*' $DIR
-rm -rf $DIR
+tar -c -z -f $TAR --exclude '*.jar' --exclude '*/doc/*' $DIR
+rm -rf $DIR $3
 
 # move to directory 'tarballs'
 if [ -r .svn/deb-layout ]; then
   . .svn/deb-layout
-  mv $3 $origDir
-  echo "moved $3 to $origDir"
+  mv $TAR $origDir
+  echo "moved $TAR to $origDir"
 fi
 
-exit 0

Modified: trunk/libmp3spi-java/debian/rules
===================================================================
--- trunk/libmp3spi-java/debian/rules	2011-08-16 09:04:53 UTC (rev 14200)
+++ trunk/libmp3spi-java/debian/rules	2011-08-16 13:25:36 UTC (rev 14201)
@@ -3,9 +3,10 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-JAVA_HOME                  := /usr/lib/jvm/java-gcj
+JAVA_HOME                  := /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET       := all
-DEB_JARS                   := jl tritonus_share
+DEB_ANT_CHECK_TARGET       := buildtest
+DEB_JARS                   := jl tritonus_share ant-junit junit
 DEB_INSTALL_CHANGELOGS_ALL := CHANGES.txt
 
 install/libmp3spi-java::
@@ -14,4 +15,4 @@
 	  /usr/share/java/mp3spi.jar
 
 get-orig-source:
-	-uscan --upstream-version 0 --rename
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download

Added: trunk/libmp3spi-java/debian/source/format
===================================================================
--- trunk/libmp3spi-java/debian/source/format	                        (rev 0)
+++ trunk/libmp3spi-java/debian/source/format	2011-08-16 13:25:36 UTC (rev 14201)
@@ -0,0 +1 @@
+3.0 (quilt)

Modified: trunk/libmp3spi-java/debian/watch
===================================================================
--- trunk/libmp3spi-java/debian/watch	2011-08-16 09:04:53 UTC (rev 14200)
+++ trunk/libmp3spi-java/debian/watch	2011-08-16 13:25:36 UTC (rev 14201)
@@ -1,3 +1,3 @@
 version=3
-http://www.javazoom.net/mp3spi/sources.html sources/mp3spi(.*).tar.gz \
+http://www.javazoom.net/mp3spi/sources.html sources/mp3spi(.*).zip \
   debian debian/orig-tar.sh


