[pkg-java] r14922 - in trunk/fop/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-16 07:06:41 +0000 (Fri, 16 Sep 2011)
New Revision: 14922

Removed:
   trunk/fop/debian/patches/dump_exception.patch
Modified:
   trunk/fop/debian/fop.sh
   trunk/fop/debian/patches/series
Log:
As discussed on #575411 by Gabriel C.

Modified: trunk/fop/debian/fop.sh
===================================================================
--- trunk/fop/debian/fop.sh	2011-09-15 20:33:44 UTC (rev 14921)
+++ trunk/fop/debian/fop.sh	2011-09-16 07:06:41 UTC (rev 14922)
@@ -40,6 +40,6 @@
 fi
 find_jars fop
 
+LOG_OPTION=-Dorg.apache.commons.logging.Log=org.apache.fop.util.CommandLineLogger
 
-
-run_java $HEADLESS org.apache.fop.cli.Main "$@"
+run_java $HEADLESS org.apache.fop.cli.Main $LOG_OPTION "$@"

Deleted: trunk/fop/debian/patches/dump_exception.patch
===================================================================
--- trunk/fop/debian/patches/dump_exception.patch	2011-09-15 20:33:44 UTC (rev 14921)
+++ trunk/fop/debian/patches/dump_exception.patch	2011-09-16 07:06:41 UTC (rev 14922)
@@ -1,14 +0,0 @@
-Dump exception, as suggest on bug #639162
-Index: fop-1.0/src/java/org/apache/fop/cli/Main.java
-===================================================================
---- fop-1.0.orig/src/java/org/apache/fop/cli/Main.java	2011-09-11 14:50:52.000000000 +0200
-+++ fop-1.0/src/java/org/apache/fop/cli/Main.java	2011-09-11 14:51:11.000000000 +0200
-@@ -186,6 +186,8 @@
-                 System.exit(0);
-             }
-         } catch (Exception e) {
-+          System.out.println("Exception: "+ e.toString());
-+          e.printStackTrace();
-             if (options != null) {
-                 options.getLogger().error("Exception", e);
-                 if (options.getOutputFile() != null) {

Modified: trunk/fop/debian/patches/series
===================================================================
--- trunk/fop/debian/patches/series	2011-09-15 20:33:44 UTC (rev 14921)
+++ trunk/fop/debian/patches/series	2011-09-16 07:06:41 UTC (rev 14922)
@@ -1,4 +1,3 @@
 04_fixqdoxbuildfailure.patch
-dump_exception.patch
 enco.patch
 enco2.patch