[pkg-java] r14507 - in trunk/libxerces2-java/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Fri Aug 26 22:06:12 UTC 2011
Author: drazzib
Date: 2011-08-26 22:06:12 +0000 (Fri, 26 Aug 2011)
New Revision: 14507
Modified:
trunk/libxerces2-java/debian/changelog
trunk/libxerces2-java/debian/control
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_manifest_classpath.patch
Log:
* Add myself as Uploaders.
* Add Depends on libxml-commons-external-java for jaxp-1.4.jar
(Closes: #639333).
* Drop Depends on libjaxp-1.3.jar.
Modified: trunk/libxerces2-java/debian/changelog
===================================================================
--- trunk/libxerces2-java/debian/changelog 2011-08-26 22:05:13 UTC (rev 14506)
+++ trunk/libxerces2-java/debian/changelog 2011-08-26 22:06:12 UTC (rev 14507)
@@ -1,3 +1,12 @@
+libxerces2-java (2.11.0-2) unstable; urgency=low
+
+ * Add myself as Uploaders.
+ * Add Depends on libxml-commons-external-java for jaxp-1.4.jar
+ (Closes: #639333).
+ * Drop Depends on libjaxp-1.3.jar.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sat, 27 Aug 2011 00:05:03 +0200
+
libxerces2-java (2.11.0-1) unstable; urgency=low
* Team upload.
Modified: trunk/libxerces2-java/debian/control
===================================================================
--- trunk/libxerces2-java/debian/control 2011-08-26 22:05:13 UTC (rev 14506)
+++ trunk/libxerces2-java/debian/control 2011-08-26 22:06:12 UTC (rev 14507)
@@ -2,10 +2,11 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Marcus Better <marcus at better.se>, Matthias Klose <doko at ubuntu.com>, Michael Koch <konqueror at gmx.de>
+Uploaders: Marcus Better <marcus at better.se>, Matthias Klose <doko at ubuntu.com>, Michael Koch <konqueror at gmx.de>,
+ Damien Raude-Morvan <drazzib at debian.org>
Build-Depends: cdbs (>= 0.4.8), debhelper (>= 7), default-jdk, gcj-native-helper, ant,
- maven-repo-helper, libxml-commons-resolver1.1-java, libjaxp1.3-java, libstylebook-java,
- libxml-commons-external-java (>= 1.4.01)
+ maven-repo-helper, libxml-commons-resolver1.1-java, libstylebook-java,
+ libxml-commons-external-java (>= 1.4.01-2)
Standards-Version: 3.9.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libxerces2-java
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libxerces2-java
@@ -13,8 +14,8 @@
Package: libxerces2-java
Architecture: all
-Depends: ${misc:Depends}, libjaxp1.3-java
-Recommends: libxml-commons-resolver1.1-java, libxml-commons-external-java
+Depends: ${misc:Depends}, libxml-commons-resolver1.1-java,
+ libxml-commons-external-java (>= 1.4.01-2)
Suggests: libxerces2-java-doc, libxerces2-java-gcj
Description: Validating XML parser for Java with DOM level 3 support
The Xerces2 Java parser is the reference implementation of XNI, the
@@ -43,7 +44,7 @@
Package: libxerces2-java-gcj
Architecture: any
Section: libs
-Depends: libxerces2-java (>= ${source:Version}), libjaxp1.3-java-gcj, ${misc:Depends}, ${shlibs:Depends}
+Depends: libxerces2-java (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: Validating XML parser for Java with DOM level 3 support (native code)
The Xerces2 Java parser is the reference implementation of XNI, the
Xerces Native Interface, and also a fully conforming XML Schema processor.
Modified: trunk/libxerces2-java/debian/patches/01_xjavac_taskdef.patch
===================================================================
--- trunk/libxerces2-java/debian/patches/01_xjavac_taskdef.patch 2011-08-26 22:05:13 UTC (rev 14506)
+++ trunk/libxerces2-java/debian/patches/01_xjavac_taskdef.patch 2011-08-26 22:06:12 UTC (rev 14507)
@@ -11,3 +11,30 @@
<classpath>
<pathelement location="${tools.dir}/bin/xjavac.jar"/>
</classpath>
+@@ -291,7 +291,7 @@
+ source="${javac.source}"
+ target="${javac.target}"
+ classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}"
+- debug="${debug}"
++ debug="${debug}" nowarn="true"
+ debuglevel="${debuglevel}"
+ deprecation="${deprecation}"
+ optimize="${optimize}"
+@@ -359,7 +359,7 @@
+ source="${javac.source}"
+ target="${javac.target}"
+ classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
+- debug="${debug}"
++ debug="${debug}" nowarn="true"
+ debuglevel="${debuglevel}"
+ includeAntRuntime="false"
+ includeJavaRuntime="true"/>
+@@ -379,7 +379,7 @@
+ source="${javac.source}"
+ target="${javac.target}"
+ classpath="${tools.dir}/${jar.apis}:${build.dir}/classes:./tools/junit.jar"
+- debug="${debug}"
++ debug="${debug}" nowarn="true"
+ debuglevel="${debuglevel}"
+ includeAntRuntime="false"
+ includeJavaRuntime="true"/>
Modified: trunk/libxerces2-java/debian/patches/02_build_dont_unzip.patch
===================================================================
--- trunk/libxerces2-java/debian/patches/02_build_dont_unzip.patch 2011-08-26 22:05:13 UTC (rev 14506)
+++ trunk/libxerces2-java/debian/patches/02_build_dont_unzip.patch 2011-08-26 22:06:12 UTC (rev 14507)
@@ -7,7 +7,7 @@
tofile="${build.src}/org/apache/xerces/impl/xpath/regex/message_en.properties"/>
- <!-- now deal with API's: -->
-+ <!-- not neede for Debian, use the classes in /usr/share/java/jaxp-1.3.jar
++ <!-- not needed for Debian
<unzip src="${src.apis.zip}" dest="${build.src}">
<patternset
includes="org/xml/sax/**
@@ -19,3 +19,21 @@
<!-- substitute tokens as needed -->
<replace file="${build.dir}/src/org/apache/xerces/impl/Version.java"
+@@ -1232,7 +1233,7 @@
+ <replace file="${build.dir}/src/org/apache/xerces/parsers/AbstractSAXParser.java"
+ token="return (fConfiguration instanceof XML11Configurable);" value="return false;"/>
+
+- <!-- now deal with API's: -->
++ <!-- not needed for Debian
+ <unzip src="${src.apis.zip}" dest="${build.src}">
+ <patternset
+ includes="org/xml/sax/**
+@@ -1255,7 +1256,7 @@
+ org/w3c/dom/xpath/**"
+ />
+ </unzip>
+-
++ -->
+
+ <!-- substitute tokens as needed -->
+ <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java"
Modified: trunk/libxerces2-java/debian/patches/03_bootclasspath.patch
===================================================================
--- trunk/libxerces2-java/debian/patches/03_bootclasspath.patch 2011-08-26 22:05:13 UTC (rev 14506)
+++ trunk/libxerces2-java/debian/patches/03_bootclasspath.patch 2011-08-26 22:06:12 UTC (rev 14507)
@@ -2,24 +2,30 @@
===================================================================
--- a/build.xml
+++ b/build.xml
-@@ -297,7 +297,8 @@
+@@ -291,7 +291,7 @@
+ destdir="${build.dest}"
+ source="${javac.source}"
+ target="${javac.target}"
+- classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}"
++ classpath="${build.dir}/classes:/usr/share/java/jaxp-1.4.jar:/usr/share/java/xml-apis-ext.jar:/usr/share/java/xml-resolver.jar"
+ debug="${debug}" nowarn="true"
+ debuglevel="${debuglevel}"
deprecation="${deprecation}"
- optimize="${optimize}"
+@@ -359,7 +359,7 @@
+ destdir="${build.dest}"
+ source="${javac.source}"
+ target="${javac.target}"
+- classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
++ classpath="${build.dir}/classes:/usr/share/java/jaxp-1.4.jar:/usr/share/java/xml-apis-ext.jar:/usr/share/java/xml-resolver.jar"
+ debug="${debug}" nowarn="true"
+ debuglevel="${debuglevel}"
includeAntRuntime="false"
-- includeJavaRuntime="false"
-+ includeJavaRuntime="true"
-+ bootclasspath="/usr/share/java/jaxp-1.3.jar:/usr/share/java/xml-apis-ext.jar:/usr/share/java/xml-resolver.jar"
- excludes="org/xml/sax/**
- javax/xml/**
- org/w3c/dom/*
-@@ -363,7 +364,9 @@
+@@ -1301,7 +1301,7 @@
+ destdir="${build.dest}"
+ source="${javac.source}"
+ target="${javac.target}"
+- classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
++ classpath="${build.dir}/classes:/usr/share/java/jaxp-1.4.jar:/usr/share/java/xml-apis-ext.jar"
debug="${debug}"
debuglevel="${debuglevel}"
- includeAntRuntime="false"
-- includeJavaRuntime="true"/>
-+ includeJavaRuntime="true"
-+ bootclasspath="/usr/share/java/jaxp-1.3.jar:/usr/share/java/xml-apis-ext.jar:/usr/share/java/xml-resolver.jar"
-+ />
- </target>
-
- <!-- =================================================================== -->
+ deprecation="${deprecation}"
Modified: trunk/libxerces2-java/debian/patches/04_manifest_classpath.patch
===================================================================
--- trunk/libxerces2-java/debian/patches/04_manifest_classpath.patch 2011-08-26 22:05:13 UTC (rev 14506)
+++ trunk/libxerces2-java/debian/patches/04_manifest_classpath.patch 2011-08-26 22:06:12 UTC (rev 14507)
@@ -5,7 +5,7 @@
@@ -1,5 +1,6 @@
Manifest-Version: 1.0
Created-By: @java.version@ (@java.vendor@)
-+Class-Path: xml-apis-ext.jar, xml-resolver.jar, jaxp-1.3.jar
++Class-Path: xml-apis-ext.jar, xml-resolver.jar, jaxp-1.4.jar
Name: org/apache/xerces/impl/Version.class
Comment: @impl.name@
More information about the pkg-java-commits
mailing list