[libxerces2-java] 18/61: libxerces2-java (2.8.0-0) experimental; urgency=low

Sun Jun 18 22:23:39 UTC 2017

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 4a89b8d01c4fdd27f96244359c59f90ce960c599
Author: Arnaud Vandyck <avdyk at debian.org>
Date:   Mon Jul 3 11:28:04 2006 +0000

    libxerces2-java (2.8.0-0) experimental; urgency=low
    
      * New upstream release.
      * Built with gcj
      * Updated to Standards-Version 3.7.2: cdbs and debhelper to
        Build-Depends
      * Removed jikes compiler definition
    
     -- Arnaud Vandyck <avdyk at debian.org>  Mon,  3 Jul 2006 13:27:27 +0200
---
 debian/ant.properties                    |  2 +-
 debian/changelog                         | 10 ++++++++++
 debian/control                           |  5 +++--
 debian/libxerces2-java.links             |  2 +-
 debian/patches/01_xjavac_taskdef.patch   | 20 ++++++++++----------
 debian/patches/02_build_dont_unzip.patch |  2 +-
 debian/patches/03_bootclasspath.patch    |  2 +-
 debian/patches/04_build_target13.patch   |  2 +-
 debian/rules                             |  7 ++-----
 9 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
index f01a99a..3a417f9 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -1,4 +1,4 @@
-jar.apis=jaxp-1.2.jar
+jar.apis=jaxp-1.3.jar
 jar.resolver=xml-commons-resolver-1.1.jar
 tools.dir=/usr/share/java
 
diff --git a/debian/changelog b/debian/changelog
index fe5cc3c..892fbbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libxerces2-java (2.8.0-0) experimental; urgency=low
+
+  * New upstream release.
+  * Built with gcj
+  * Updated to Standards-Version 3.7.2: cdbs and debhelper to
+    Build-Depends
+  * Removed jikes compiler definition
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Mon,  3 Jul 2006 13:27:27 +0200
+
 libxerces2-java (2.6.2-4) unstable; urgency=low
 
   * gnujaxp transition 
diff --git a/debian/control b/debian/control
index 535ff15..b37281f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,9 @@ 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>, 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
-Standards-Version: 3.6.2
+Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.2.0)
+Build-Depends-Indep: java-gcj-compat-dev, ant, libjaxp1.3-java, libxml-commons-resolver1.1-java
+Standards-Version: 3.7.2
 
 Package: libxerces2-java
 Architecture: all
diff --git a/debian/libxerces2-java.links b/debian/libxerces2-java.links
index 940dd43..07ec05a 100644
--- a/debian/libxerces2-java.links
+++ b/debian/libxerces2-java.links
@@ -1 +1 @@
-/usr/share/java/jaxp-1.2.jar	/usr/share/java/xmlParserAPIs.jar
+/usr/share/java/jaxp-1.3.jar	/usr/share/java/xmlParserAPIs.jar
diff --git a/debian/patches/01_xjavac_taskdef.patch b/debian/patches/01_xjavac_taskdef.patch
index a22a24e..e094ffc 100644
--- a/debian/patches/01_xjavac_taskdef.patch
+++ b/debian/patches/01_xjavac_taskdef.patch
@@ -1,11 +1,11 @@
---- build.xml.orig	2004-02-17 15:11:07.000000000 +0100
-+++ build.xml	2004-02-17 21:30:12.000000000 +0100
-@@ -19,7 +19,7 @@
- <project default="usage" basedir=".">
+--- build.xml~	2006-03-01 01:14:50.000000000 +0000
++++ build.xml	2006-07-03 09:58:48.000000000 +0000
+@@ -28,7 +28,7 @@
+   <property name="tools.dir" value="./tools"/>
  
-   <!-- enable compilation under IBM JDK 1.4 -->
--  <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"/>
-+  <taskdef name="xjavac" classname="org.apache.tools.ant.taskdefs.Javac"/>
- 
-   <!-- Allow properties following these statements to be overridden -->
-   <!-- Note that all of these don't have to exist.  They've just been defined
+   <!-- enable compilation under JDK 1.4 and above -->
+-  <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac">
++  <taskdef name="xjavac" classname="org.apache.tools.ant.taskdefs.Javac">
+     <classpath>
+       <pathelement location="${tools.dir}/bin/xjavac.jar"/>
+     </classpath>
diff --git a/debian/patches/02_build_dont_unzip.patch b/debian/patches/02_build_dont_unzip.patch
index 9930f33..b533fda 100644
--- a/debian/patches/02_build_dont_unzip.patch
+++ b/debian/patches/02_build_dont_unzip.patch
@@ -4,7 +4,7 @@
      </copy>
  
      <!-- now deal with API's:  -->
-+    <!-- not neede for Debian, use the classes in /usr/share/java/jaxp-1.2.jar
++    <!-- not neede for Debian, use the classes in /usr/share/java/jaxp-1.3.jar
      <unzip src="${src.apis.zip}" dest="${build.src}">
          <patternset
              includes="org/xml/sax/** 
diff --git a/debian/patches/03_bootclasspath.patch b/debian/patches/03_bootclasspath.patch
index 12c4abe..fbb602f 100644
--- a/debian/patches/03_bootclasspath.patch
+++ b/debian/patches/03_bootclasspath.patch
@@ -6,7 +6,7 @@
             includeAntRuntime="false"
 -           includeJavaRuntime="false"
 +           includeJavaRuntime="true"
-+           bootclasspath="/usr/share/java/jaxp-1.2.jar"
++           bootclasspath="/usr/share/java/jaxp-1.3.jar"
             excludes="org/xml/sax/** 
                  javax/xml/parsers/**
                  org/w3c/dom/*
diff --git a/debian/patches/04_build_target13.patch b/debian/patches/04_build_target13.patch
index 95eb502..2c1531a 100644
--- a/debian/patches/04_build_target13.patch
+++ b/debian/patches/04_build_target13.patch
@@ -4,7 +4,7 @@
      <xjavac srcdir="${build.src}"
             destdir="${build.dest}"
             classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}"
-+           target="1.3"           
++           target="1.4"           
             debug="${debug}"
             deprecation="${deprecation}"
             optimize="${optimize}"
diff --git a/debian/rules b/debian/rules
index ccd3c8b..e27a7f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,15 +5,12 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME := /usr/lib/fjsdk
+JAVA_HOME := /usr/lib/jvm/java-gcj
 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 := $(ANT_HOME)/lib/ant-launcher.jar xml-commons-resolver-1.1
-
-# Build compiler
-DEB_ANT_COMPILER := jikes
+DEB_JARS := xml-commons-resolver-1.1 jaxp-1.3.jar
 
 # Ant targets to call
 DEB_ANT_CLEAN_TARGET :=

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

