[pkg-java] r15761 - in trunk/libjogl-java/debian: . patches

[Miguel Landaeta]

Author: nomadium-guest
Date: 2012-02-05 21:03:08 +0000 (Sun, 05 Feb 2012)
New Revision: 15761

Added:
   trunk/libjogl-java/debian/patches/antlr-classpath.diff
Modified:
   trunk/libjogl-java/debian/changelog
   trunk/libjogl-java/debian/control
   trunk/libjogl-java/debian/patches/series
Log:
Replace Build-Depends on ant1.7 with ant. (Closes: #640270)


Modified: trunk/libjogl-java/debian/changelog
===================================================================
--- trunk/libjogl-java/debian/changelog	2012-02-05 20:26:00 UTC (rev 15760)
+++ trunk/libjogl-java/debian/changelog	2012-02-05 21:03:08 UTC (rev 15761)
@@ -1,3 +1,10 @@
+libjogl-java (1.1.1+dak1-12) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Replace Build-Depends on ant1.7 with ant. (Closes: #640270).
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Sun, 05 Feb 2012 16:10:18 -0430
+
 libjogl-java (1.1.1+dak1-11) unstable; urgency=low
 
   * Team upload.

Modified: trunk/libjogl-java/debian/control
===================================================================
--- trunk/libjogl-java/debian/control	2012-02-05 20:26:00 UTC (rev 15760)
+++ trunk/libjogl-java/debian/control	2012-02-05 21:03:08 UTC (rev 15761)
@@ -5,7 +5,7 @@
 Uploaders: Sylvestre Ledru <sylvestre at debian.org>,
  Torsten Werner <twerner at debian.org>
 Build-Depends: debhelper (>= 5), cdbs, quilt, default-jdk,
- ant1.7-optional, libgl1-mesa-dev, libglu1-mesa-dev, libxxf86vm-dev, 
+ ant-optional, libgl1-mesa-dev, libglu1-mesa-dev, libxxf86vm-dev, 
  x11proto-xf86vidmode-dev, libxt-dev, 
 # antlr java packages started to exist at version 2.7.7-8. Before, it 
 # was included in the antlr package

Added: trunk/libjogl-java/debian/patches/antlr-classpath.diff
===================================================================
--- trunk/libjogl-java/debian/patches/antlr-classpath.diff	                        (rev 0)
+++ trunk/libjogl-java/debian/patches/antlr-classpath.diff	2012-02-05 21:03:08 UTC (rev 15761)
@@ -0,0 +1,22 @@
+--- libjogl-java-1.1.1+dak1.orig/gluegen/make/build.xml	2012-02-05 16:07:15.000000000 -0430
++++ libjogl-java-1.1.1+dak1/gluegen/make/build.xml	2012-02-05 16:09:19.000000000 -0430
+@@ -96,6 +96,9 @@
+     -        the directory does not exist, it will be created.
+     -->
+   <target name="generate.c.grammar">
++    <path id="antlr.classpath">
++      <pathelement location="/usr/share/java/antlr.jar" />
++    </path>
+     <!-- Generate the Java files -->
+     <antlr target="${output.dir}/${target}" outputdirectory="${output.dir}">
+       <classpath refid="antlr.classpath" />
+@@ -112,6 +115,9 @@
+     -        the directory does not exist, it will be created.
+    -->
+   <target name="generate.c.grammar.glib">
++    <path id="antlr.classpath">
++      <pathelement location="/usr/share/java/antlr.jar" />
++    </path>
+     <!-- Generate the Java files -->
+     <antlr target="${output.dir}/${target}" glib="${output.dir}/${glib}" outputdirectory="${output.dir}">
+       <classpath refid="antlr.classpath" />

Modified: trunk/libjogl-java/debian/patches/series
===================================================================
--- trunk/libjogl-java/debian/patches/series	2012-02-05 20:26:00 UTC (rev 15760)
+++ trunk/libjogl-java/debian/patches/series	2012-02-05 21:03:08 UTC (rev 15761)
@@ -4,3 +4,4 @@
 
 
 defaultDebianPath.diff
+antlr-classpath.diff