Sun Jun 18 22:23:42 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 54ff7bdf8e8b46b0189d9424305808b812f8665e
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Wed Aug 24 22:37:54 2011 +0000

    * Team upload.
    * New upstream release.
    * Bump up Standards-Version to 3.9.2: no changes needed.
    * d/control: Drop Arnaud from Uploaders. Thanks!
    * Switch to 3.0 (quilt) format.
    * Bump up debhelper compat to 7.
    * d/control: Build-Depends o, default-jdk + gcj-native-helper (instead of
      default-jdk-builddep).
    * d/control: Drop Depends on JRE as per Debian Java Policy.
    * d/control: Only Suggests -gcj packages.
    * d/control: Build-Depends on libxml-commons-external for
      org.w3c.dom.ElementTraversal.
    * d/patches/03_bootclasspath.patch: Fix name of xml-resolver.jar
      (Closes: #638576).
    * d/rules: install xercesSamples.jar (Closes: #567001).
    * d/patches/04_manifest_classpath.patch: Set a Class-Path in Manifest for
      xml-apis-ext, xml-resolver and jaxp-1.3.
---
 debian/ant.properties                      |  4 ---
 debian/changelog                           | 25 +++++++++++++++++--
 debian/compat                              |  2 +-
 debian/control                             | 15 ++++++------
 debian/patches/01_xjavac_taskdef.patch     | 24 +++++++++---------
 debian/patches/02_build_dont_unzip.patch   | 39 ++++++++++++++++--------------
 debian/patches/03_bootclasspath.patch      | 37 +++++++++++++++++++---------
 debian/patches/04_manifest_classpath.patch | 11 +++++++++
 debian/patches/series                      |  4 +++
 debian/rules                               | 10 +-------
 debian/source/format                       |  1 +
 11 files changed, 108 insertions(+), 64 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
deleted file mode 100644
index 3a417f9..0000000
--- a/debian/ant.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-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 9dde4e8..32641eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,29 @@
-libxerces2-java (2.9.1-5) UNRELEASED; urgency=low
+libxerces2-java (2.11.0-1) unstable; urgency=low
 
+  * Team upload.
+
+  [ Ludovic Claude ]
   * Change section of libxerces2-java-gcj to libs
 
- -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 09 Aug 2009 13:20:11 +0100
+  [ Damien Raude-Morvan ]
+  * New upstream release.
+  * Bump up Standards-Version to 3.9.2: no changes needed.
+  * d/control: Drop Arnaud from Uploaders. Thanks!
+  * Switch to 3.0 (quilt) format.
+  * Bump up debhelper compat to 7.
+  * d/control: Build-Depends o, default-jdk + gcj-native-helper (instead of
+    default-jdk-builddep).
+  * d/control: Drop Depends on JRE as per Debian Java Policy.
+  * d/control: Only Suggests -gcj packages.
+  * d/control: Build-Depends on libxml-commons-external for
+    org.w3c.dom.ElementTraversal.
+  * d/patches/03_bootclasspath.patch: Fix name of xml-resolver.jar
+    (Closes: #638576).
+  * d/rules: install xercesSamples.jar (Closes: #567001).
+  * d/patches/04_manifest_classpath.patch: Set a Class-Path in Manifest for
+    xml-apis-ext, xml-resolver and jaxp-1.3.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 25 Aug 2011 00:29:32 +0200
 
 libxerces2-java (2.9.1-4) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 1e8b314..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+7
diff --git a/debian/control b/debian/control
index f181b05..13c1abb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,19 +2,20 @@ Source: libxerces2-java
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Marcus Better <marcus at better.se>, Matthias Klose <doko at ubuntu.com>, Michael Koch <konqueror at gmx.de>
-Build-Depends: cdbs (>= 0.4.8), debhelper (>= 6), default-jdk-builddep, ant,
- maven-repo-helper, libxml-commons-resolver1.1-java, libjaxp1.3-java, libstylebook-java
-Standards-Version: 3.8.1
+Uploaders: Marcus Better <marcus at better.se>, Matthias Klose <doko at ubuntu.com>, Michael Koch <konqueror at gmx.de>
+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)
+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
 Homepage: http://xerces.apache.org/xerces2-j/
 
 Package: libxerces2-java
 Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java1-runtime-headless | java2-runtime-headless, libjaxp1.3-java
-Recommends: libxerces2-java-gcj
-Suggests: libxerces2-java-doc
+Depends: ${misc:Depends}, libjaxp1.3-java
+Recommends: libxml-commons-resolver1.1-java, libxml-commons-external-java
+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
  Xerces Native Interface, and also a fully conforming XML Schema processor.
diff --git a/debian/patches/01_xjavac_taskdef.patch b/debian/patches/01_xjavac_taskdef.patch
index e094ffc..413f2e1 100644
--- a/debian/patches/01_xjavac_taskdef.patch
+++ b/debian/patches/01_xjavac_taskdef.patch
@@ -1,11 +1,13 @@
---- 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 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>
+Index: b/build.xml
+===================================================================
+--- a/build.xml
++++ b/build.xml
+@@ -39,7 +39,7 @@
+   <property name="tools.dir" value="./tools"/>
+ 
+   <!-- 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 b533fda..462d2ba 100644
--- a/debian/patches/02_build_dont_unzip.patch
+++ b/debian/patches/02_build_dont_unzip.patch
@@ -1,18 +1,21 @@
---- build.xml.orig	2004-01-30 16:42:54.000000000 +0100
-+++ build.xml	2004-02-18 13:40:34.000000000 +0100
-@@ -191,6 +191,7 @@
-     </copy>
- 
-     <!-- now deal with API's:  -->
-+    <!-- 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/** 
-@@ -202,6 +203,7 @@
-                 org/w3c/dom/traversal/**"
-         />
-     </unzip>
-+    -->
-     
-     <!-- substitute tokens as needed -->
-     <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 
+Index: b/build.xml
+===================================================================
+--- a/build.xml
++++ b/build.xml
+@@ -247,7 +247,7 @@
+     <copy file="${src.dir}/org/apache/xerces/impl/xpath/regex/message.properties"
+       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
+     <unzip src="${src.apis.zip}" dest="${build.src}">
+         <patternset
+             includes="org/xml/sax/** 
+@@ -270,6 +270,7 @@
+                 org/w3c/dom/xpath/**"
+         />
+     </unzip>
++    -->
+     
+     <!-- substitute tokens as needed -->
+     <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 
diff --git a/debian/patches/03_bootclasspath.patch b/debian/patches/03_bootclasspath.patch
index fbb602f..2d1ea46 100644
--- a/debian/patches/03_bootclasspath.patch
+++ b/debian/patches/03_bootclasspath.patch
@@ -1,12 +1,25 @@
---- 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.3.jar"
-            excludes="org/xml/sax/** 
-                 javax/xml/parsers/**
-                 org/w3c/dom/*
+Index: b/build.xml
+===================================================================
+--- a/build.xml
++++ b/build.xml
+@@ -297,7 +297,8 @@
+            deprecation="${deprecation}"
+            optimize="${optimize}"
+            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 @@
+            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>
+ 
+   <!-- =================================================================== -->
diff --git a/debian/patches/04_manifest_classpath.patch b/debian/patches/04_manifest_classpath.patch
new file mode 100644
index 0000000..64a108b
--- /dev/null
+++ b/debian/patches/04_manifest_classpath.patch
@@ -0,0 +1,11 @@
+Index: b/src/manifest.xerces
+===================================================================
+--- a/src/manifest.xerces
++++ b/src/manifest.xerces
+@@ -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
+ 
+ Name: org/apache/xerces/impl/Version.class
+ Comment: @impl.name@ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0e4eaf5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+01_xjavac_taskdef.patch
+02_build_dont_unzip.patch
+03_bootclasspath.patch
+04_manifest_classpath.patch
diff --git a/debian/rules b/debian/rules
index 9792b9e..a036b0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,7 @@
 #!/usr/bin/make -f
 # debian/rules file for libxerces2-java (uses cdbs)
 
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-
 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
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
@@ -19,11 +15,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
   with_gcj_native := yes
 endif
 
-# 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 := xml-commons-resolver-1.1 
-#jaxp-1.3.jar stylebook
-
 # Ant targets to call
 DEB_ANT_CLEAN_TARGET := clean
 DEB_ANT_BUILD_TARGET := jar sampjar javadocs 
@@ -32,6 +23,7 @@ DEB_ANT_BUILD_TARGET := jar sampjar javadocs
 install/$(PACKAGE)::
 	mh_installpoms -p$(PACKAGE);
 	mh_installjar -p$(PACKAGE) -l debian/pom.xml $(DEB_BUILDDIR)/build/xercesImpl.jar
+	dh_install -p$(PACKAGE) $(DEB_BUILDDIR)/build/xercesSamples.jar /usr/share/java/
 
 ifeq ($(with_gcj_native),yes)
 install/libxerces2-java-gcj:: install/libxerces2-java
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

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

