[pkg-java] r4826 - trunk/libvorbisspi-java/debian

[varun-guest at alioth.debian.org]

Author: varun-guest
Date: 2007-11-24 08:52:01 +0000 (Sat, 24 Nov 2007)
New Revision: 4826

Modified:
   trunk/libvorbisspi-java/debian/changelog
   trunk/libvorbisspi-java/debian/orig-tar.sh
   trunk/libvorbisspi-java/debian/rules
   trunk/libvorbisspi-java/debian/watch
Log:
* Some fixes in watch and orig-tar.sh files.


Modified: trunk/libvorbisspi-java/debian/changelog
===================================================================
--- trunk/libvorbisspi-java/debian/changelog	2007-11-23 23:01:23 UTC (rev 4825)
+++ trunk/libvorbisspi-java/debian/changelog	2007-11-24 08:52:01 UTC (rev 4826)
@@ -7,12 +7,13 @@
     + Add XS-Vcs-{Svn,Browser} headers.
     + Build-Depend on libjorbis-java instead of cortado.
   * Add debian/README.Debian-source file.
+  * Fix debian/watch and debian/orig-tar.sh files.
 
   [ Torsten Werner ]
   * Switch from kaffe to java-gcj-compat-dev.
   * New upstream version
 
- -- Torsten Werner <twerner at debian.org>  Thu, 22 Nov 2007 23:27:49 +0100
+ -- Varun Hiremath <varunhiremath at gmail.com>  Sat, 24 Nov 2007 14:33:36 +0530
 
 libvorbisspi-java (1.0.2-1) unstable; urgency=low
 

Modified: trunk/libvorbisspi-java/debian/orig-tar.sh
===================================================================
--- trunk/libvorbisspi-java/debian/orig-tar.sh	2007-11-23 23:01:23 UTC (rev 4825)
+++ trunk/libvorbisspi-java/debian/orig-tar.sh	2007-11-24 08:52:01 UTC (rev 4826)
@@ -1,21 +1,21 @@
 #!/bin/sh -e
 
 # called by uscan with '--upstream-version' <version> <file>
-
+TAR=../libvorbisspi-java_$2.orig.tar.gz
 DIR=libvorbisspi-java-$2.orig
 
 # clean up the upstream tarball
-tar -x -z -f $3
+unzip $3
 mv VorbisSPI$2 $DIR
-tar -c -z -f $3 --exclude '*.jar' --exclude '*/classes/*' --exclude '*/docs/*' \
+tar -c -z -f $TAR --exclude '*.jar' --exclude '*/classes/*' --exclude '*/docs/*' \
   $DIR
-rm -rf $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/libvorbisspi-java/debian/rules
===================================================================
--- trunk/libvorbisspi-java/debian/rules	2007-11-23 23:01:23 UTC (rev 4825)
+++ trunk/libvorbisspi-java/debian/rules	2007-11-24 08:52:01 UTC (rev 4826)
@@ -5,11 +5,11 @@
 
 JAVA_HOME            := /usr/lib/jvm/java-gcj
 DEB_ANT_BUILD_TARGET := all
-DEB_JARS             := jorbis jogg tritonus_share /usr/lib/kaffe/jre/lib/rt.jar
+DEB_JARS             := jorbis jogg tritonus_share
 
 install/libvorbisspi-java::
 	install -m 644 -D vorbisspi*.jar $(DEB_DESTDIR)/usr/share/java/vorbisspi-$(DEB_UPSTREAM_VERSION).jar	
 	dh_link /usr/share/java/vorbisspi-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/vorbisspi.jar
 
 get-orig-source:
-	-uscan --upstream-version 0 --rename
+	-uscan --upstream-version 0

Modified: trunk/libvorbisspi-java/debian/watch
===================================================================
--- trunk/libvorbisspi-java/debian/watch	2007-11-23 23:01:23 UTC (rev 4825)
+++ trunk/libvorbisspi-java/debian/watch	2007-11-24 08:52:01 UTC (rev 4826)
@@ -1,3 +1,3 @@
 version=3
-http://www.javazoom.net/vorbisspi/sources.html sources/vorbisspi(.*).tar.gz \
+http://www.javazoom.net/vorbisspi/sources/ vorbisspi(.*)\.zip \
   debian debian/orig-tar.sh