r2239 - in trunk/libxerces2-java/debian: . patches

Arnaud Vandyck avdyk at costa.debian.org
Mon Jul 3 11:28:05 UTC 2006 

Author: avdyk
Date: 2006-07-03 11:28:04 +0000 (Mon, 03 Jul 2006)
New Revision: 2239

Modified:
   trunk/libxerces2-java/debian/ant.properties
   trunk/libxerces2-java/debian/changelog
   trunk/libxerces2-java/debian/control
   trunk/libxerces2-java/debian/libxerces2-java.links
   trunk/libxerces2-java/debian/patches/01_xjavac_taskdef.patch
   trunk/libxerces2-java/debian/patches/02_build_dont_unzip.patch
   trunk/libxerces2-java/debian/patches/03_bootclasspath.patch
   trunk/libxerces2-java/debian/patches/04_build_target13.patch
   trunk/libxerces2-java/debian/rules
Log:
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



Modified: trunk/libxerces2-java/debian/ant.properties
===================================================================
--- trunk/libxerces2-java/debian/ant.properties	2006-07-03 10:32:10 UTC (rev 2238)
+++ trunk/libxerces2-java/debian/ant.properties	2006-07-03 11:28:04 UTC (rev 2239)
@@ -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
 

Modified: trunk/libxerces2-java/debian/changelog
===================================================================
--- trunk/libxerces2-java/debian/changelog	2006-07-03 10:32:10 UTC (rev 2238)
+++ trunk/libxerces2-java/debian/changelog	2006-07-03 11:28:04 UTC (rev 2239)
@@ -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 

Modified: trunk/libxerces2-java/debian/control
===================================================================
--- trunk/libxerces2-java/debian/control	2006-07-03 10:32:10 UTC (rev 2238)
+++ trunk/libxerces2-java/debian/control	2006-07-03 11:28:04 UTC (rev 2239)
@@ -3,8 +3,9 @@
 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

Modified: trunk/libxerces2-java/debian/libxerces2-java.links
===================================================================
--- trunk/libxerces2-java/debian/libxerces2-java.links	2006-07-03 10:32:10 UTC (rev 2238)
+++ trunk/libxerces2-java/debian/libxerces2-java.links	2006-07-03 11:28:04 UTC (rev 2239)
@@ -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

Modified: trunk/libxerces2-java/debian/patches/01_xjavac_taskdef.patch
===================================================================
--- trunk/libxerces2-java/debian/patches/01_xjavac_taskdef.patch	2006-07-03 10:32:10 UTC (rev 2238)
+++ trunk/libxerces2-java/debian/patches/01_xjavac_taskdef.patch	2006-07-03 11:28:04 UTC (rev 2239)
@@ -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>

Modified: trunk/libxerces2-java/debian/patches/02_build_dont_unzip.patch
===================================================================
--- trunk/libxerces2-java/debian/patches/02_build_dont_unzip.patch	2006-07-03 10:32:10 UTC (rev 2238)
+++ trunk/libxerces2-java/debian/patches/02_build_dont_unzip.patch	2006-07-03 11:28:04 UTC (rev 2239)
@@ -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/** 

Modified: trunk/libxerces2-java/debian/patches/03_bootclasspath.patch
===================================================================
--- trunk/libxerces2-java/debian/patches/03_bootclasspath.patch	2006-07-03 10:32:10 UTC (rev 2238)
+++ trunk/libxerces2-java/debian/patches/03_bootclasspath.patch	2006-07-03 11:28:04 UTC (rev 2239)
@@ -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/*

Modified: trunk/libxerces2-java/debian/patches/04_build_target13.patch
===================================================================
--- trunk/libxerces2-java/debian/patches/04_build_target13.patch	2006-07-03 10:32:10 UTC (rev 2238)
+++ trunk/libxerces2-java/debian/patches/04_build_target13.patch	2006-07-03 11:28:04 UTC (rev 2239)
@@ -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}"

Modified: trunk/libxerces2-java/debian/rules
===================================================================
--- trunk/libxerces2-java/debian/rules	2006-07-03 10:32:10 UTC (rev 2238)
+++ trunk/libxerces2-java/debian/rules	2006-07-03 11:28:04 UTC (rev 2239)
@@ -5,16 +5,13 @@
 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
+DEB_JARS := xml-commons-resolver-1.1 jaxp-1.3.jar
 
-# Build compiler
-DEB_ANT_COMPILER := jikes
-
 # Ant targets to call
 DEB_ANT_CLEAN_TARGET :=
 DEB_ANT_BUILD_TARGET := jar

More information about the pkg-java-commits mailing list