[pkg-java] r7042 - in trunk/libxml-commons-resolver1.1-java/debian: . patches

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-09-23 19:41:20 +0000 (Tue, 23 Sep 2008)
New Revision: 7042

Added:
   trunk/libxml-commons-resolver1.1-java/debian/patches/
   trunk/libxml-commons-resolver1.1-java/debian/patches/nb-new-api.diff
   trunk/libxml-commons-resolver1.1-java/debian/patches/series
Modified:
   trunk/libxml-commons-resolver1.1-java/debian/changelog
   trunk/libxml-commons-resolver1.1-java/debian/control
   trunk/libxml-commons-resolver1.1-java/debian/rules
Log:
* Non-maintainer upload.
* Add patch for netbeans from Yulia Novozhilova. (Closes: #495104)

Modified: trunk/libxml-commons-resolver1.1-java/debian/changelog
===================================================================
--- trunk/libxml-commons-resolver1.1-java/debian/changelog	2008-09-23 19:21:38 UTC (rev 7041)
+++ trunk/libxml-commons-resolver1.1-java/debian/changelog	2008-09-23 19:41:20 UTC (rev 7042)
@@ -1,3 +1,10 @@
+libxml-commons-resolver1.1-java (1.2-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add patch for netbeans from Yulia Novozhilova. (Closes: #495104)
+
+ -- Torsten Werner <twerner at debian.org>  Tue, 23 Sep 2008 21:19:52 +0200
+
 libxml-commons-resolver1.1-java (1.2-2) unstable; urgency=low
 
   * Build-Depends on default-jdk-builddep. Closes: #477897.

Modified: trunk/libxml-commons-resolver1.1-java/debian/control
===================================================================
--- trunk/libxml-commons-resolver1.1-java/debian/control	2008-09-23 19:21:38 UTC (rev 7041)
+++ trunk/libxml-commons-resolver1.1-java/debian/control	2008-09-23 19:41:20 UTC (rev 7042)
@@ -3,7 +3,7 @@
 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>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 4.2.0), cdbs (>= 0.4.8), default-jdk-builddep, ant, libjaxp1.3-java
+Build-Depends: debhelper (>= 4.2.0), cdbs (>= 0.4.8), default-jdk-builddep, ant, libjaxp1.3-java, quilt
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libxml-commons-resolver1.1-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libxml-commons-resolver1.1-java

Added: trunk/libxml-commons-resolver1.1-java/debian/patches/nb-new-api.diff
===================================================================
--- trunk/libxml-commons-resolver1.1-java/debian/patches/nb-new-api.diff	                        (rev 0)
+++ trunk/libxml-commons-resolver1.1-java/debian/patches/nb-new-api.diff	2008-09-23 19:41:20 UTC (rev 7042)
@@ -0,0 +1,47 @@
+Index: libxml-commons-resolver1.1-java-1.2/resolver.xml
+===================================================================
+--- libxml-commons-resolver1.1-java-1.2.orig/resolver.xml	2006-11-20 21:23:07.000000000 +0100
++++ libxml-commons-resolver1.1-java-1.2/resolver.xml	2008-09-23 21:24:47.000000000 +0200
+@@ -88,7 +88,7 @@
+ 
+    <echo message="Compiling..." />
+ 
+-   <javac srcdir="${src.dir}" destdir="${build.classes.dir}" debug="true" optimize="true" deprecation="true" verbose="false">
++   <javac srcdir="${src.dir}" destdir="${build.classes.dir}" debug="true" optimize="true" deprecation="true" verbose="false" source="1.4">
+      <!-- <classpath> not needed since Ant already supplies these Sep-03 -sc -->
+      <include name="${resolver.subdir}/*.java"/>
+      <include name="${resolver.subdir}/helpers/*.java"/>
+Index: libxml-commons-resolver1.1-java-1.2/src/org/apache/xml/resolver/Catalog.java
+===================================================================
+--- libxml-commons-resolver1.1-java-1.2.orig/src/org/apache/xml/resolver/Catalog.java	2006-11-20 21:23:06.000000000 +0100
++++ libxml-commons-resolver1.1-java-1.2/src/org/apache/xml/resolver/Catalog.java	2008-09-23 21:26:38.000000000 +0200
+@@ -29,6 +29,7 @@
+ import java.util.Enumeration;
+ import java.util.Hashtable;
+ import java.util.Vector;
++import java.util.Iterator;
+ 
+ import java.net.URL;
+ import java.net.MalformedURLException;
+@@ -1166,6 +1167,21 @@
+     }
+   }
+ 
++  /**
++   * Return all registered public IDs.
++   */
++  public Iterator getPublicIDs() {
++    Vector v = new Vector();
++    Enumeration enum = catalogEntries.elements();
++    
++    while (enum.hasMoreElements()) {
++	CatalogEntry e = (CatalogEntry) enum.nextElement();
++	if (e.getEntryType() == PUBLIC) {
++	    v.add(e.getEntryArg(0));
++	}
++    }
++    return v.iterator();
++  }
+ 
+   /**
+    * Return the applicable DOCTYPE system identifier.

Added: trunk/libxml-commons-resolver1.1-java/debian/patches/series
===================================================================
--- trunk/libxml-commons-resolver1.1-java/debian/patches/series	                        (rev 0)
+++ trunk/libxml-commons-resolver1.1-java/debian/patches/series	2008-09-23 19:41:20 UTC (rev 7042)
@@ -0,0 +1 @@
+nb-new-api.diff

Modified: trunk/libxml-commons-resolver1.1-java/debian/rules
===================================================================
--- trunk/libxml-commons-resolver1.1-java/debian/rules	2008-09-23 19:21:38 UTC (rev 7041)
+++ trunk/libxml-commons-resolver1.1-java/debian/rules	2008-09-23 19:41:20 UTC (rev 7042)
@@ -3,6 +3,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 include /usr/share/gcj/debian_defaults                                                                                                                                               
 ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))