[pkg-java] r18837 - in trunk/libtritonus-java/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2015-09-02 10:06:49 +0000 (Wed, 02 Sep 2015)
New Revision: 18837

Added:
   trunk/libtritonus-java/debian/patches/ignore-ant-dtd.diff
Modified:
   trunk/libtritonus-java/debian/changelog
   trunk/libtritonus-java/debian/patches/series
   trunk/libtritonus-java/debian/rules
Log:
Skip the generation of the Ant DTD to avoid a build failure



Modified: trunk/libtritonus-java/debian/changelog
===================================================================
--- trunk/libtritonus-java/debian/changelog	2015-09-02 09:38:00 UTC (rev 18836)
+++ trunk/libtritonus-java/debian/changelog	2015-09-02 10:06:49 UTC (rev 18837)
@@ -1,9 +1,13 @@
 libtritonus-java (20070428-11) UNRELEASED; urgency=medium
 
+  [ tony mancill ]
   * Team upload.
   * Correct -10 revision changelog entry.  The bug closed was #738361, not
     #738425 as in the upload.
 
+  [ Emmanuel Bourg ]
+  * Skip the generation of the Ant DTD to avoid a build failure.
+
  -- tony mancill <tmancill at debian.org>  Sun, 09 Feb 2014 10:58:08 -0800
 
 libtritonus-java (20070428-10) unstable; urgency=medium

Added: trunk/libtritonus-java/debian/patches/ignore-ant-dtd.diff
===================================================================
--- trunk/libtritonus-java/debian/patches/ignore-ant-dtd.diff	                        (rev 0)
+++ trunk/libtritonus-java/debian/patches/ignore-ant-dtd.diff	2015-09-02 10:06:49 UTC (rev 18837)
@@ -0,0 +1,14 @@
+Description: Don't use the Ant DTD
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/build.xml
++++ b/build.xml
+@@ -3,7 +3,7 @@
+      run the following command:
+      ant -f build-dtd.xml
+ -->
+-<!DOCTYPE project SYSTEM "project.dtd" [
++<!DOCTYPE project [
+ <!ENTITY common SYSTEM "build-common.xml">
+ ]>
+ 

Modified: trunk/libtritonus-java/debian/patches/series
===================================================================
--- trunk/libtritonus-java/debian/patches/series	2015-09-02 09:38:00 UTC (rev 18836)
+++ trunk/libtritonus-java/debian/patches/series	2015-09-02 10:06:49 UTC (rev 18837)
@@ -6,3 +6,4 @@
 pvorbis.diff
 dfsg.diff
 alsa-1.0.16.diff
+ignore-ant-dtd.diff

Modified: trunk/libtritonus-java/debian/rules
===================================================================
--- trunk/libtritonus-java/debian/rules	2015-09-02 09:38:00 UTC (rev 18836)
+++ trunk/libtritonus-java/debian/rules	2015-09-02 10:06:49 UTC (rev 18837)
@@ -26,7 +26,6 @@
 
 common-binary-indep:: debian/stamp-binary-indep
 debian/stamp-binary-indep:
-	ant -f build-dtd.xml -propertyfile debian/ant.properties
 	CLASSPATH=/usr/share/java/jl.jar:/usr/share/java/jorbis.jar:/usr/share/java/jogg.jar ant -propertyfile debian/ant.properties
 	touch $@