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

[twerner at alioth.debian.org]

Author: twerner
Date: 2009-01-30 22:05:51 +0000 (Fri, 30 Jan 2009)
New Revision: 7909

Modified:
   trunk/libxml-commons-resolver1.1-java/debian/changelog
   trunk/libxml-commons-resolver1.1-java/debian/patches/nb-extra.diff
Log:
Remove debug statements from patch nb-extra.diff - thanks to Marek Slama.

Modified: trunk/libxml-commons-resolver1.1-java/debian/changelog
===================================================================
--- trunk/libxml-commons-resolver1.1-java/debian/changelog	2009-01-30 14:24:13 UTC (rev 7908)
+++ trunk/libxml-commons-resolver1.1-java/debian/changelog	2009-01-30 22:05:51 UTC (rev 7909)
@@ -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.

Modified: trunk/libxml-commons-resolver1.1-java/debian/patches/nb-extra.diff
===================================================================
--- trunk/libxml-commons-resolver1.1-java/debian/patches/nb-extra.diff	2009-01-30 14:24:13 UTC (rev 7908)
+++ trunk/libxml-commons-resolver1.1-java/debian/patches/nb-extra.diff	2009-01-30 22:05:51 UTC (rev 7909)
@@ -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 @@
 +
 +  /** 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 @@
 +   * <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 @@
 +    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 @@
 +
 +  /** 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());
 +  }