[pkg-java] r18529 - in trunk/ant/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-10-07 22:14:19 +0000 (Tue, 07 Oct 2014)
New Revision: 18529

Removed:
   trunk/ant/debian/patches/0003-add-Xerces-from-Debian-s-path.patch
Modified:
   trunk/ant/debian/changelog
   trunk/ant/debian/control
   trunk/ant/debian/patches/series
   trunk/ant/debian/rules
Log:
Removed the patch adding Xerces to the Ant classpath (Closes: #552032, #764376)



Modified: trunk/ant/debian/changelog
===================================================================
--- trunk/ant/debian/changelog	2014-10-07 13:03:25 UTC (rev 18528)
+++ trunk/ant/debian/changelog	2014-10-07 22:14:19 UTC (rev 18529)
@@ -1,3 +1,11 @@
+ant (1.9.4-3) UNRELEASED; urgency=medium
+
+  * Removed the patch adding Xerces to the Ant classpath
+    (Closes: #552032, #764376)
+  * Removed the dependency on libxerces2-java and libjaxp1.3-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 08 Oct 2014 00:06:55 +0200
+
 ant (1.9.4-2) unstable; urgency=medium
 
   * Depend on libmail-java instead of libgnumail-java

Modified: trunk/ant/debian/control
===================================================================
--- trunk/ant/debian/control	2014-10-07 13:03:25 UTC (rev 18528)
+++ trunk/ant/debian/control	2014-10-07 22:14:19 UTC (rev 18529)
@@ -19,14 +19,12 @@
                libcommons-logging-java,
                libcommons-net-java,
                libmail-java,
-               libjaxp1.3-java,
                libjdepend-java,
                libjsch-java,
                liblog4j1.2-java,
                liboro-java,
                libregexp-java,
                libxalan2-java (>= 2.4.0),
-               libxerces2-java,
                libxml-commons-resolver1.1-java (>= 1.2-7~),
                maven-repo-helper (>> 1.0)
 Standards-Version: 3.9.6
@@ -37,7 +35,6 @@
 Package: ant
 Architecture: all
 Depends: default-jre-headless | java5-runtime-headless | java6-runtime-headless | java7-runtime-headless,
-         libxerces2-java,
          ${misc:Depends}
 Recommends: ant-optional
 Suggests: ant-doc, ant-gcj, default-jdk | java-compiler | java-sdk

Deleted: trunk/ant/debian/patches/0003-add-Xerces-from-Debian-s-path.patch
===================================================================
--- trunk/ant/debian/patches/0003-add-Xerces-from-Debian-s-path.patch	2014-10-07 13:03:25 UTC (rev 18528)
+++ trunk/ant/debian/patches/0003-add-Xerces-from-Debian-s-path.patch	2014-10-07 22:14:19 UTC (rev 18529)
@@ -1,24 +0,0 @@
-From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Date: Thu, 11 Mar 2010 21:50:06 +0100
-Subject: [PATCH] add Xerces from Debian's path
-
----
- src/script/ant |    7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
---- a/src/script/ant
-+++ b/src/script/ant
-@@ -159,6 +159,13 @@
-   exit 1
- fi
- 
-+# Add the Xerces 2 XML parser in the Debian version
-+if [ -z "$LOCALCLASSPATH" ] ; then
-+  LOCALCLASSPATH="/usr/share/java/xmlParserAPIs.jar:/usr/share/java/xercesImpl.jar"
-+else
-+  LOCALCLASSPATH="/usr/share/java/xmlParserAPIs.jar:/usr/share/java/xercesImpl.jar:$LOCALCLASSPATH"
-+fi
-+
- # Build local classpath using just the launcher in non-rpm mode or
- # use the Jpackage helper in rpm mode with basic and default jars
- # specified in the ant.conf configuration. Because the launcher is

Modified: trunk/ant/debian/patches/series
===================================================================
--- trunk/ant/debian/patches/series	2014-10-07 13:03:25 UTC (rev 18528)
+++ trunk/ant/debian/patches/series	2014-10-07 22:14:19 UTC (rev 18529)
@@ -1,5 +1,4 @@
 0002-do-not-build-test-jars.patch
-0003-add-Xerces-from-Debian-s-path.patch
 0005-add-gjdoc-task.patch
 0006-fix-ANT_HOME-path.patch
 0007-use-build.classpath.patch

Modified: trunk/ant/debian/rules
===================================================================
--- trunk/ant/debian/rules	2014-10-07 13:03:25 UTC (rev 18528)
+++ trunk/ant/debian/rules	2014-10-07 22:14:19 UTC (rev 18529)
@@ -41,13 +41,9 @@
 stamp-build-ant:
 	# doing bootstrapping
 	install -d bootstrap/lib
-	ln -sf /usr/share/java/xml-apis.jar $(DEB_BUILDDIR)/bootstrap/lib/xml-apis.jar
-	ln -sf /usr/share/java/xercesImpl.jar $(DEB_BUILDDIR)/bootstrap/lib/xercesImpl.jar
 	/bin/sh bootstrap.sh
 	# the rest
 	/bin/sh bootstrap/bin/ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -Dbuild.classpath=${CLASSPATH} -propertyfile debian/ant.properties jars test-jar
-	ln -sf /usr/share/java/xml-apis.jar $(DEB_BUILDDIR)/lib/xml-apis.jar
-	ln -sf /usr/share/java/xercesImpl.jar $(DEB_BUILDDIR)/lib/xercesImpl.jar
 	touch stamp-build-ant
 
 build-ant-doc: stamp-build-ant-doc