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 4b75d8faf4873f830c69001e44d1a5244a62947f Author: Torsten Werner <[email protected]> Date: Tue Sep 23 19:41:20 2008 +0000 * Non-maintainer upload. * Add patch for netbeans from Yulia Novozhilova. (Closes: #495104) --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/patches/nb-new-api.diff | 47 ++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 1 + 5 files changed, 57 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6a75b86..de131c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 <[email protected]> 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. diff --git a/debian/control b/debian/control index 92ab57a..e046dc5 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Stefan Gybas <[email protected]>, Arnaud Vandyck <[email protected]>, Michael Koch <[email protected]> -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 diff --git a/debian/patches/nb-new-api.diff b/debian/patches/nb-new-api.diff new file mode 100644 index 0000000..64b68fa --- /dev/null +++ b/debian/patches/nb-new-api.diff @@ -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. diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..efb356f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +nb-new-api.diff diff --git a/debian/rules b/debian/rules index 3c6c6b9..3bf235e 100755 --- a/debian/rules +++ b/debian/rules @@ -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))) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxml-commons-resolver1.1-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
