[libxml-commons-resolver1.1-java] 18/35: Remove debug statements from patch nb-extra.diff - thanks to Marek Slama.

[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 09714a953d0f1ad654ee4dd592312916c04ef418
Author: Torsten Werner <twerner at debian.org>
Date:   Fri Jan 30 22:05:51 2009 +0000

    Remove debug statements from patch nb-extra.diff - thanks to Marek Slama.
---
 debian/changelog             |  6 ++++++
 debian/patches/nb-extra.diff | 23 ++++++++++-------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d10d11c..6965218 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxml-commons-resolver1.1-java (1.2-4) unstable; urgency=low
+
+  * Remove debug statements from patch nb-extra.diff - thanks to Marek Slama.
+
+ -- Torsten Werner <twerner at debian.org>  Fri, 30 Jan 2009 23:03:37 +0100
+
 libxml-commons-resolver1.1-java (1.2-3) unstable; urgency=low
 
   * Add another patch for netbeans from Yulia Novozhilova.
diff --git a/debian/patches/nb-extra.diff b/debian/patches/nb-extra.diff
index 3b8fd79..22e9d67 100644
--- a/debian/patches/nb-extra.diff
+++ b/debian/patches/nb-extra.diff
@@ -1,7 +1,8 @@
-diff -Nur -x '*.orig' -x '*~' libxml-commons-resolver1.1-java-1.2/src/org/apache/xml/resolver/NbCatalogManager.java libxml-commons-resolver1.1-java-1.2.new/src/org/apache/xml/resolver/NbCatalogManager.java
---- libxml-commons-resolver1.1-java-1.2/src/org/apache/xml/resolver/NbCatalogManager.java	1970-01-01 03:00:00.000000000 +0300
-+++ libxml-commons-resolver1.1-java-1.2.new/src/org/apache/xml/resolver/NbCatalogManager.java	2008-12-09 00:20:12.000000000 +0300
-@@ -0,0 +1,842 @@
+Index: libxml-commons-resolver1.1-java-1.2/src/org/apache/xml/resolver/NbCatalogManager.java
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ libxml-commons-resolver1.1-java-1.2/src/org/apache/xml/resolver/NbCatalogManager.java	2009-01-30 23:02:32.000000000 +0100
+@@ -0,0 +1,840 @@
 +// CatalogManager.java - Access CatalogManager.properties
 +
 +/*
@@ -208,7 +209,6 @@ diff -Nur -x '*.orig' -x '*~' libxml-commons-resolver1.1-java-1.2/src/org/apache
 +
 +  /** Constructor. */
 +  public NbCatalogManager() {
-+      System.out.println("## patched CatalogManager.constructor1");
 +    debug = new Debug();
 +    // Note that we don't setDebug() here; we do that lazily. Either the
 +    // user will set it explicitly, or we'll do it automagically if they
@@ -223,7 +223,6 @@ diff -Nur -x '*.orig' -x '*~' libxml-commons-resolver1.1-java-1.2/src/org/apache
 +   * <code>null</code> means that no property file is consulted at all.
 +   */
 +  public NbCatalogManager(String propertyFile) {
-+      System.out.println("## patched CatalogManager.constructor2");
 +    this.propertyFile = propertyFile;
 +
 +    debug = new Debug();
@@ -844,10 +843,11 @@ diff -Nur -x '*.orig' -x '*~' libxml-commons-resolver1.1-java-1.2/src/org/apache
 +    return getCatalogClassName();
 +  }
 +}
-diff -Nur -x '*.orig' -x '*~' libxml-commons-resolver1.1-java-1.2/src/org/apache/xml/resolver/tools/NbCatalogResolver.java libxml-commons-resolver1.1-java-1.2.new/src/org/apache/xml/resolver/tools/NbCatalogResolver.java
---- libxml-commons-resolver1.1-java-1.2/src/org/apache/xml/resolver/tools/NbCatalogResolver.java	1970-01-01 03:00:00.000000000 +0300
-+++ libxml-commons-resolver1.1-java-1.2.new/src/org/apache/xml/resolver/tools/NbCatalogResolver.java	2008-12-09 00:20:12.000000000 +0300
-@@ -0,0 +1,319 @@
+Index: libxml-commons-resolver1.1-java-1.2/src/org/apache/xml/resolver/tools/NbCatalogResolver.java
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ libxml-commons-resolver1.1-java-1.2/src/org/apache/xml/resolver/tools/NbCatalogResolver.java	2009-01-30 23:02:49.000000000 +0100
+@@ -0,0 +1,316 @@
 +// CatalogResolver.java - A SAX EntityResolver/JAXP URI Resolver
 +
 +/*
@@ -925,19 +925,16 @@ diff -Nur -x '*.orig' -x '*~' libxml-commons-resolver1.1-java-1.2/src/org/apache
 +
 +  /** Constructor */
 +  public NbCatalogResolver() {
-+      System.out.println("## patched NbCatalogResolver.constructor1");
 +    initializeCatalogs(false);
 +  }
 +
 +  /** Constructor */
 +  public NbCatalogResolver(boolean privateCatalog) {
-+      System.out.println("## patched NbCatalogResolver.constructor2");
 +    initializeCatalogs(privateCatalog);
 +  }
 +
 +  /** Constructor */
 +  public NbCatalogResolver(NbCatalogManager manager) {
-+      System.out.println("## patched NbCatalogResolver.constructor3");
 +    catalogManager = manager;
 +    initializeCatalogs(!catalogManager.getUseStaticCatalog());
 +  }

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