[libxerces2-java] 14/61: libxerces2-java (2.6.2-3) unstable; urgency=low

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libxerces2-java.

commit c206bd6d442e96aa76b748c69fbdc517d9639f3f
Author: Wolfgang Bär <wbaer at gmx.de>
Date:   Sun Sep 25 01:12:29 2005 +0000

    libxerces2-java (2.6.2-3) unstable; urgency=low
    
      * libant1.6-java to ant transition
      * As we now have ant >= 1.6.3 we can drop the dom2 source hack
        + Remove dom2 source from debian package
        + Added bootclasspath patch to the javac target
      * Standards-Version 3.6.2 (no changes)
---
 debian/changelog                                  | 10 ++++++++++
 debian/control                                    |  6 +++---
 debian/libxerces2-java.links                      |  1 -
 debian/patches/03_bootclasspath.patch             | 12 ++++++++++++
 debian/patches/03_build_include_dom2_source.patch | 13 -------------
 debian/rules                                      |  4 ++--
 6 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 61d22f3..07f3b80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libxerces2-java (2.6.2-3) unstable; urgency=low
+
+  * libant1.6-java to ant transition
+  * As we now have ant >= 1.6.3 we can drop the dom2 source hack
+    + Remove dom2 source from debian package
+    + Added bootclasspath patch to the javac target
+  * Standards-Version 3.6.2 (no changes)
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Sun, 25 Sep 2005 02:02:36 +0200
+
 libxerces2-java (2.6.2-2) unstable; urgency=medium
 
   * Included DOM Level 2 sources from the libjaxp1.2-java 
diff --git a/debian/control b/debian/control
index 72dd0f3..57963b4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: libxerces2-java
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Takashi Okamoto <tora at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: cdbs (>= 0.4.8), debhelper (>= 4.2.0), free-java-sdk, sablevm (>= 1.1.5-1), libant1.6-java, libjaxp1.2-java, libxml-commons-resolver1.1-java, libgnujaxp-java
-Standards-Version: 3.6.1
+Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
+Build-Depends-Indep: cdbs (>= 0.4.8), debhelper (>= 4.2.0), free-java-sdk, sablevm (>= 1.1.5-1), ant, libjaxp1.2-java, libxml-commons-resolver1.1-java, libgnujaxp-java
+Standards-Version: 3.6.2
 
 Package: libxerces2-java
 Architecture: all
diff --git a/debian/libxerces2-java.links b/debian/libxerces2-java.links
index 575031a..940dd43 100644
--- a/debian/libxerces2-java.links
+++ b/debian/libxerces2-java.links
@@ -1,2 +1 @@
 /usr/share/java/jaxp-1.2.jar	/usr/share/java/xmlParserAPIs.jar
-
diff --git a/debian/patches/03_bootclasspath.patch b/debian/patches/03_bootclasspath.patch
new file mode 100644
index 0000000..12c4abe
--- /dev/null
+++ b/debian/patches/03_bootclasspath.patch
@@ -0,0 +1,12 @@
+--- build.xml.orig	2005-09-25 02:22:43.000000000 +0200
++++ build.xml	2005-09-25 02:18:57.000000000 +0200
+@@ -228,7 +228,8 @@
+            deprecation="${deprecation}"
+            optimize="${optimize}"
+            includeAntRuntime="false"
+-           includeJavaRuntime="false"
++           includeJavaRuntime="true"
++           bootclasspath="/usr/share/java/jaxp-1.2.jar"
+            excludes="org/xml/sax/** 
+                 javax/xml/parsers/**
+                 org/w3c/dom/*
diff --git a/debian/patches/03_build_include_dom2_source.patch b/debian/patches/03_build_include_dom2_source.patch
deleted file mode 100644
index eb74b45..0000000
--- a/debian/patches/03_build_include_dom2_source.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- build.xml.orig	2005-04-16 20:01:07.000000000 +0200
-+++ build.xml	2005-04-16 19:22:52.000000000 +0200
-@@ -219,6 +219,10 @@
-         includes="**/*.res, **/*.properties">
-       </fileset>
-     </copy>
-+    <echo message="Copying DOM Level 2 source file for build trick !"/>
-+    <copy todir="${build.src}">
-+      <fileset dir="debian/dom2-bindings" includes="**/*.java"/>
-+    </copy>
- 
-     <xjavac srcdir="${build.src}"
-            destdir="${build.dest}"
diff --git a/debian/rules b/debian/rules
index 8f9576b..ccd3c8b 100644
--- a/debian/rules
+++ b/debian/rules
@@ -6,11 +6,11 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME := /usr/lib/fjsdk
-ANT_HOME  := /usr/share/ant1.6
+ANT_HOME  := /usr/share/ant
 
 # Additional JARs to add to the class path, either full path or just the
 # basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted
-DEB_JARS := /usr/share/ant1.6/lib/ant-launcher.jar xml-commons-resolver-1.1
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar xml-commons-resolver-1.1
 
 # Build compiler
 DEB_ANT_COMPILER := jikes

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxerces2-java.git