[pkg-java] r7104 - in trunk/libxpp3-java/debian: . patches

[marcusb-guest at alioth.debian.org]

Author: marcusb-guest
Date: 2008-10-02 15:46:11 +0000 (Thu, 02 Oct 2008)
New Revision: 7104

Added:
   trunk/libxpp3-java/debian/patches/03_exclude_javax_xml.patch
Modified:
   trunk/libxpp3-java/debian/changelog
   trunk/libxpp3-java/debian/control
Log:
* Do not include the javax.xml.namespace.QName class since it is likely
  to cause conflicts. (Closes: #500909)
* Added myself to Uploaders, removed Wolfgang.

Modified: trunk/libxpp3-java/debian/changelog
===================================================================
--- trunk/libxpp3-java/debian/changelog	2008-10-02 14:01:15 UTC (rev 7103)
+++ trunk/libxpp3-java/debian/changelog	2008-10-02 15:46:11 UTC (rev 7104)
@@ -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

Modified: trunk/libxpp3-java/debian/control
===================================================================
--- trunk/libxpp3-java/debian/control	2008-10-02 14:01:15 UTC (rev 7103)
+++ trunk/libxpp3-java/debian/control	2008-10-02 15:46:11 UTC (rev 7104)
@@ -2,7 +2,7 @@
 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
 

Added: trunk/libxpp3-java/debian/patches/03_exclude_javax_xml.patch
===================================================================
--- trunk/libxpp3-java/debian/patches/03_exclude_javax_xml.patch	                        (rev 0)
+++ trunk/libxpp3-java/debian/patches/03_exclude_javax_xml.patch	2008-10-02 15:46:11 UTC (rev 7104)
@@ -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>
+ 
+