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

[twerner at alioth.debian.org]

Author: twerner
Date: 2009-01-14 21:47:59 +0000 (Wed, 14 Jan 2009)
New Revision: 7820

Added:
   trunk/libjmac-java/debian/bin/
   trunk/libjmac-java/debian/bin/jmac
   trunk/libjmac-java/debian/install
Modified:
   trunk/libjmac-java/debian/build.xml
   trunk/libjmac-java/debian/changelog
   trunk/libjmac-java/debian/control
   trunk/libjmac-java/debian/watch
Log:
* Add a command line launcher /usr/bin/jmac. (Closes: #510828)
* Simplify debian/watch.
* Bump up Standards-Version: 3.8.0 (no changes).
* Switch to default-jdk/-jre.
* Disable compiler warnings.

Added: trunk/libjmac-java/debian/bin/jmac
===================================================================
--- trunk/libjmac-java/debian/bin/jmac	                        (rev 0)
+++ trunk/libjmac-java/debian/bin/jmac	2009-01-14 21:47:59 UTC (rev 7820)
@@ -0,0 +1,9 @@
+#!/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
+


Property changes on: trunk/libjmac-java/debian/bin/jmac
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/libjmac-java/debian/build.xml
===================================================================
--- trunk/libjmac-java/debian/build.xml	2009-01-14 06:18:29 UTC (rev 7819)
+++ trunk/libjmac-java/debian/build.xml	2009-01-14 21:47:59 UTC (rev 7820)
@@ -31,9 +31,7 @@
 	   debug="true"
 	   optimize="true"
 	   includes="**/*.java"
-           encoding="UTF-8"
-           fork="true"
-	   executable="/usr/bin/ecj"
+	   nowarn="true"
 	   source="1.5">
     </javac>
 
@@ -42,9 +40,7 @@
        debug="true"
        optimize="true"
        includes="**/*.java"
-       encoding="UTF-8"
-       fork="true"
-       executable="/usr/bin/ecj"
+       nowarn="true"
        source="1.5">
       <classpath>
         <pathelement path="${builddir}/core/classes"/>
@@ -56,9 +52,7 @@
        debug="true"
        optimize="true"
        includes="davaguine/jmac/spi/*.java,davaguine/jmac/spi/tritonus/*.java"
-       encoding="UTF-8"
-       fork="true"
-       executable="/usr/bin/ecj"
+       nowarn="true"
        source="1.5">
       <classpath>
         <pathelement path="${builddir}/core/classes"/>
@@ -73,9 +67,7 @@
        excludes="davaguine/jmac/spi/APEAudioFileFormat.java,
        davaguine/jmac/spi/APEAudioFileReader.java,
        davaguine/jmac/spi/APEAudioFormat.java"
-       encoding="UTF-8"
-       fork="true"
-       executable="/usr/bin/ecj"
+       nowarn="true"
        source="1.5">
       <classpath>
         <pathelement path="${builddir}/core/classes"/>

Modified: trunk/libjmac-java/debian/changelog
===================================================================
--- trunk/libjmac-java/debian/changelog	2009-01-14 06:18:29 UTC (rev 7819)
+++ trunk/libjmac-java/debian/changelog	2009-01-14 21:47:59 UTC (rev 7820)
@@ -1,3 +1,13 @@
+libjmac-java (1.74-3) experimental; urgency=low
+
+  * Add a command line launcher /usr/bin/jmac. (Closes: #510828)
+  * Simplify debian/watch.
+  * Bump up Standards-Version: 3.8.0 (no changes).
+  * Switch to default-jdk/-jre.
+  * Disable compiler warnings.
+
+ -- Torsten Werner <twerner at debian.org>  Wed, 14 Jan 2009 22:47:03 +0100
+
 libjmac-java (1.74-2) unstable; urgency=low
 
   * Move the package to pkg-java svn.

Modified: trunk/libjmac-java/debian/control
===================================================================
--- trunk/libjmac-java/debian/control	2009-01-14 06:18:29 UTC (rev 7819)
+++ trunk/libjmac-java/debian/control	2009-01-14 21:47:59 UTC (rev 7820)
@@ -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>
 Build-Depends: cdbs, debhelper (>= 5)
-Build-Depends-Indep: ant, ecj, java-gcj-compat-dev, libtritonus-java
-Standards-Version: 3.7.3
+Build-Depends-Indep: ant, default-jdk, libtritonus-java
+Standards-Version: 3.8.0
 Homepage: http://jmac.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjmac-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjmac-java
 
 Package: libjmac-java
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: default-jre | java2-runtime
 Description: Open Source Java Monkey's Audio Decoder/Encoder/JavaSound SPI
  JMAC is a Java implementation of Monkey's Audio Compression
  decoder. JMAC is a Java library that decodes, converts and plays

Added: trunk/libjmac-java/debian/install
===================================================================
--- trunk/libjmac-java/debian/install	                        (rev 0)
+++ trunk/libjmac-java/debian/install	2009-01-14 21:47:59 UTC (rev 7820)
@@ -0,0 +1 @@
+debian/bin /usr/

Modified: trunk/libjmac-java/debian/watch
===================================================================
--- trunk/libjmac-java/debian/watch	2009-01-14 06:18:29 UTC (rev 7819)
+++ trunk/libjmac-java/debian/watch	2009-01-14 21:47:59 UTC (rev 7820)
@@ -1,3 +1,2 @@
 version=3
-http://heanet.dl.sourceforge.net/sourceforge/jmac/ \
-	jmac-(.*)\.tar\.gz debian debian/orig-tar.sh
+http://sf.net/jmac/ jmac-(.*)\.tar\.gz debian debian/orig-tar.sh