[libxpp3-java] 06/24: * Do not include the javax.xml.namespace.QName class since it is likely to cause conflicts. (Closes: #500909) * Added myself to Uploaders, removed Wolfgang.

[Emmanuel Bourg]

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

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

commit 8acc2ca54594c8ae57ffb5d069e880f7826898d8
Author: Marcus Better <marcus at better.se>
Date:   Thu Oct 2 15:46:11 2008 +0000

    * Do not include the javax.xml.namespace.QName class since it is likely
      to cause conflicts. (Closes: #500909)
    * Added myself to Uploaders, removed Wolfgang.
---
 debian/changelog                          |  8 ++++++++
 debian/control                            |  2 +-
 debian/patches/03_exclude_javax_xml.patch | 11 +++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 94b8b21..8351095 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libxpp3-java (1.1.3.4.O-4) unstable; urgency=low
+
+  * Do not include the javax.xml.namespace.QName class since it is likely
+    to cause conflicts. (Closes: #500909)
+  * Added myself to Uploaders, removed Wolfgang.
+
+ -- Marcus Better <marcus at better.se>  Thu, 02 Oct 2008 17:04:04 +0200
+
 libxpp3-java (1.1.3.4.O-3) unstable; urgency=low
 
   * Removed explicit usage of jikes build compiler property
diff --git a/debian/control b/debian/control
index 1892b83..a0ae3ea 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libxpp3-java
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Wolfgang Baer <WBaer at gmx.de>
+Uploaders: Marcus Better <marcus at better.se>
 Build-Depends-Indep: debhelper (>= 4.2.30), cdbs (>= 0.4.28), ant, ant-optional, kaffe, junit
 Standards-Version: 3.6.2
 
diff --git a/debian/patches/03_exclude_javax_xml.patch b/debian/patches/03_exclude_javax_xml.patch
new file mode 100644
index 0000000..d2eaeb0
--- /dev/null
+++ b/debian/patches/03_exclude_javax_xml.patch
@@ -0,0 +1,11 @@
+--- build.xml.orig	2008-10-02 17:41:06.000000000 +0200
++++ build.xml	2008-10-02 17:40:24.000000000 +0200
+@@ -254,7 +254,7 @@
+ 
+   <target name="builder" depends="prepare,api">
+     <javac debug="${debug}" deprecation="${deprecation}"
+-       srcdir="${src_builder}" destdir="${build_classes}" classpath="${build_api}"/>
++       srcdir="${src_builder}" destdir="${build_classes}" classpath="${build_api}" excludes="javax/xml/" />
+   </target>
+ 
+ 

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