[libxml-commons-resolver1.1-java] 19/35: * Add patch catalog.diff to fix catalog lookup thanks to Brian M. Carlson. (Closes: #552018) * Switch to debhelper version 5. * Add missing Depends: ${misc:Depends}. * Change Section: java.

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libxml-commons-resolver1.1-java.

commit d0db7da6be720fa9bea7cd6a2754eead82dca41e
Author: Torsten Werner <twerner at debian.org>
Date:   Wed Jan 27 19:33:35 2010 +0000

    * Add patch catalog.diff to fix catalog lookup thanks to Brian M. Carlson.
      (Closes: #552018)
    * Switch to debhelper version 5.
    * Add missing Depends: ${misc:Depends}.
    * Change Section: java.
---
 debian/changelog            | 10 ++++++++++
 debian/compat               |  2 +-
 debian/control              | 10 +++++-----
 debian/patches/catalog.diff | 20 ++++++++++++++++++++
 debian/patches/series       |  1 +
 5 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6965218..36c1abf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libxml-commons-resolver1.1-java (1.2-5) unstable; urgency=low
+
+  * Add patch catalog.diff to fix catalog lookup thanks to Brian M. Carlson.
+    (Closes: #552018)
+  * Switch to debhelper version 5.
+  * Add missing Depends: ${misc:Depends}.
+  * Change Section: java.
+
+ -- Torsten Werner <twerner at debian.org>  Wed, 27 Jan 2010 20:31:29 +0100
+
 libxml-commons-resolver1.1-java (1.2-4) unstable; urgency=low
 
   * Remove debug statements from patch nb-extra.diff - thanks to Marek Slama.
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index 0b09170..b78f96c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
 Source: libxml-commons-resolver1.1-java
-Section: libs
+Section: java
 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>, Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 4.2.0), cdbs (>= 0.4.8), default-jdk-builddep, ant, libjaxp1.3-java, quilt
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.8), default-jdk-builddep, ant, libjaxp1.3-java, quilt
 Standards-Version: 3.8.0
 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
@@ -11,8 +11,7 @@ Homepage: http://xml.apache.org/commons/
 
 Package: libxml-commons-resolver1.1-java
 Architecture: all
-Section: libs
-Depends: classpath-common | java1-runtime | java2-runtime
+Depends: classpath-common | java1-runtime | java2-runtime, ${misc:Depends}
 Suggests: libxml-commons-resolver1.1-java-doc
 Description: XML entity and URI resolver library
  Apache XML Commons Resolver simplifies the task of using XML catalog files to
@@ -22,6 +21,7 @@ Description: XML entity and URI resolver library
 Package: libxml-commons-resolver1.1-java-doc
 Architecture: all
 Section: doc
+Depends: ${misc:Depends}
 Suggests: libxml-commons-resolver1.1-java
 Description: XML entity and URI resolver library -- documentation
  Apache XML Commons Resolver simplifies the task of using XML catalog files to
@@ -33,7 +33,7 @@ Description: XML entity and URI resolver library -- documentation
 Package: libxml-commons-resolver1.1-java-gcj
 Architecture: any
 Section: libs
-Depends: libxml-commons-resolver1.1-java (= ${source:Version}), ${shlibs:Depends}
+Depends: libxml-commons-resolver1.1-java (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: XML entity and URI resolver library -- native library
  Apache XML Commons Resolver simplifies the task of using XML catalog files to
  perform entity resolution. They are used by other Apache XML projects like
diff --git a/debian/patches/catalog.diff b/debian/patches/catalog.diff
new file mode 100644
index 0000000..dc45fff
--- /dev/null
+++ b/debian/patches/catalog.diff
@@ -0,0 +1,20 @@
+diff -ur libxml-commons-resolver1.1-java.old/src/org/apache/xml/resolver/Catalog.java libxml-commons-resolver1.1-java-1.2/src/org/apache/xml/resolver/Catalog.java
+--- libxml-commons-resolver1.1-java.old/src/org/apache/xml/resolver/Catalog.java	2010-01-25 22:18:12.000000000 +0000
++++ libxml-commons-resolver1.1-java-1.2/src/org/apache/xml/resolver/Catalog.java	2010-01-25 22:19:51.000000000 +0000
+@@ -2182,13 +2182,15 @@
+    */
+   protected void addDelegate(CatalogEntry entry) {
+     int pos = 0;
++    int type = entry.getEntryType();
+     String partial = entry.getEntryArg(0);
+ 
+     Enumeration local = localDelegate.elements();
+     while (local.hasMoreElements()) {
+       CatalogEntry dpe = (CatalogEntry) local.nextElement();
+       String dp = dpe.getEntryArg(0);
+-      if (dp.equals(partial)) {
++      int dptype = dpe.getEntryType();
++      if (dp.equals(partial) && (type == dptype)) {
+ 	// we already have this prefix
+ 	return;
+       }
diff --git a/debian/patches/series b/debian/patches/series
index 71d0244..b61736a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 nb-new-api.diff
 nb-extra.diff
+catalog.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxml-commons-resolver1.1-java.git