[pkg-java] r7823 - in trunk/libjmac-java/debian: . bin

[twerner at alioth.debian.org]

Author: twerner
Date: 2009-01-15 18:28:26 +0000 (Thu, 15 Jan 2009)
New Revision: 7823

Modified:
   trunk/libjmac-java/debian/bin/jmac
   trunk/libjmac-java/debian/changelog
   trunk/libjmac-java/debian/copyright
   trunk/libjmac-java/debian/orig-tar.sh
   trunk/libjmac-java/debian/rules
Log:
* Really use default-jdk for building.
* Simplify the command line launcher.
* Minor cleanups in the debian directory.

Modified: trunk/libjmac-java/debian/bin/jmac
===================================================================
--- trunk/libjmac-java/debian/bin/jmac	2009-01-14 21:53:06 UTC (rev 7822)
+++ trunk/libjmac-java/debian/bin/jmac	2009-01-15 18:28:26 UTC (rev 7823)
@@ -1,9 +1,4 @@
 #!/bin/sh
 
-if [ -n "$3" ]
-then
-  exec java -jar /usr/share/java/jmac.jar $1 "$2" "$3"
-else
-  exec java -jar /usr/share/java/jmac.jar $1 "$2"
-fi
+exec java -jar /usr/share/java/jmac.jar "$@"
 

Modified: trunk/libjmac-java/debian/changelog
===================================================================
--- trunk/libjmac-java/debian/changelog	2009-01-14 21:53:06 UTC (rev 7822)
+++ trunk/libjmac-java/debian/changelog	2009-01-15 18:28:26 UTC (rev 7823)
@@ -1,3 +1,11 @@
+libjmac-java (1.74-4) experimental; urgency=low
+
+  * Really use default-jdk for building.
+  * Simplify the command line launcher.
+  * Minor cleanups in the debian directory.
+
+ -- Torsten Werner <twerner at debian.org>  Thu, 15 Jan 2009 19:27:25 +0100
+
 libjmac-java (1.74-3) experimental; urgency=low
 
   * Add a command line launcher /usr/bin/jmac. (Closes: #510828)

Modified: trunk/libjmac-java/debian/copyright
===================================================================
--- trunk/libjmac-java/debian/copyright	2009-01-14 21:53:06 UTC (rev 7822)
+++ trunk/libjmac-java/debian/copyright	2009-01-15 18:28:26 UTC (rev 7823)
@@ -23,7 +23,7 @@
     GNU General Public License for more details.
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
 The Debian packaging is (C) 2007, Varun Hiremath <varunhiremath at gmail.com> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

Modified: trunk/libjmac-java/debian/orig-tar.sh
===================================================================
--- trunk/libjmac-java/debian/orig-tar.sh	2009-01-14 21:53:06 UTC (rev 7822)
+++ trunk/libjmac-java/debian/orig-tar.sh	2009-01-15 18:28:26 UTC (rev 7823)
@@ -17,4 +17,3 @@
   echo "moved $3 to $origDir"
 fi
 
-exit 0

Modified: trunk/libjmac-java/debian/rules
===================================================================
--- trunk/libjmac-java/debian/rules	2009-01-14 21:53:06 UTC (rev 7822)
+++ trunk/libjmac-java/debian/rules	2009-01-15 18:28:26 UTC (rev 7823)
@@ -1,12 +1,12 @@
 #!/usr/bin/make -f
 
+include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
 
-JAVA_HOME              	:= /usr/lib/jvm/java-gcj
-DEB_ANT_BUILDFILE	:= debian/build.xml
-DEB_ANT_BUILD_TARGET 	:= jar
-DEB_JARS		:= tritonus_share
+JAVA_HOME            := /usr/lib/jvm/default-java
+DEB_ANT_BUILDFILE    := debian/build.xml
+DEB_ANT_BUILD_TARGET := jar
+DEB_JARS             := tritonus_share
 
 install/libjmac-java::
 	for i in jmac jmacdecoder jmacplayer jmacspi \
@@ -17,4 +17,4 @@
 		/usr/share/java/$$i.jar; done	
 
 get-orig-source:
-	-uscan --upstream-version 0 --rename
+	uscan --force-download --rename