[pkg-java] r19159 - in trunk/batik/debian: . patches wrappers

[Mathieu Malaterre]

Author: malat
Date: 2016-10-07 07:10:39 +0000 (Fri, 07 Oct 2016)
New Revision: 19159

Added:
   trunk/batik/debian/patches/bug805469.patch
Modified:
   trunk/batik/debian/changelog
   trunk/batik/debian/patches/series
   trunk/batik/debian/wrappers/squiggle
Log:
Fix two bugs

Modified: trunk/batik/debian/changelog
===================================================================
--- trunk/batik/debian/changelog	2016-10-05 08:29:31 UTC (rev 19158)
+++ trunk/batik/debian/changelog	2016-10-07 07:10:39 UTC (rev 19159)
@@ -1,11 +1,17 @@
 batik (1.8-4) UNRELEASED; urgency=medium
 
+  [ Jakub Adam ]
   * Team upload.
   * Fix versioned OSGi dependencies.
   * Fix repeating Breaks: in d/control.
 
- -- Jakub Adam <jakub.adam at ktknet.cz>  Sat, 06 Feb 2016 14:48:49 +0100
+  [ Mathieu Malaterre ]
+  * Team upload.
+  * Fix squiggle script crashes with a NoClassDefFoundError. Closes: #824113
+  * Fix FOUserAgent - SVG graphic could not be built. Closes: #805469
 
+ -- Mathieu Malaterre <malat at debian.org>  Fri, 07 Oct 2016 09:08:52 +0200
+
 batik (1.8-3) unstable; urgency=medium
 
   [ Mathieu Malaterre ]

Added: trunk/batik/debian/patches/bug805469.patch
===================================================================
--- trunk/batik/debian/patches/bug805469.patch	                        (rev 0)
+++ trunk/batik/debian/patches/bug805469.patch	2016-10-07 07:10:39 UTC (rev 19159)
@@ -0,0 +1,21 @@
+--- a/sources/org/apache/batik/util/ParsedURLDefaultProtocolHandler.java
++++ b/sources/org/apache/batik/util/ParsedURLDefaultProtocolHandler.java
+@@ -316,12 +316,16 @@
+         // No path? well we will treat this as being relative to it's self.
+         if (path == null) path = "";
+         idx = path.lastIndexOf('/');
+-        if (idx == -1) 
++        if (idx == -1) {
+             // baseURL is just a filename (in current dir) so use current dir
+             // as base of new URL.
+             path = "";
+-        else
++        } else {
+             path = path.substring(0,idx+1);
++            if (urlStr.startsWith(path)) {
++                urlStr = urlStr.substring(path.length());
++            }
++        }
+         
+         // System.err.println("Base Path: " + path);
+         // System.err.println("Base PortStr: " + baseURL.getPortStr());

Modified: trunk/batik/debian/patches/series
===================================================================
--- trunk/batik/debian/patches/series	2016-10-05 08:29:31 UTC (rev 19158)
+++ trunk/batik/debian/patches/series	2016-10-07 07:10:39 UTC (rev 19159)
@@ -1,3 +1,4 @@
 06_fix_paths_in_policy_files.patch
 source-1.5.patch
 remove-js.patch
+bug805469.patch

Modified: trunk/batik/debian/wrappers/squiggle
===================================================================
--- trunk/batik/debian/wrappers/squiggle	2016-10-05 08:29:31 UTC (rev 19158)
+++ trunk/batik/debian/wrappers/squiggle	2016-10-07 07:10:39 UTC (rev 19159)
@@ -4,6 +4,6 @@
 . /usr/lib/java-wrappers/java-wrappers.sh
 
 find_java_runtime java6
-find_jars xercesImpl batik-all xml-apis-ext js
+find_jars xercesImpl batik-all xml-apis-ext js xmlgraphics-commons
 
 run_java org.apache.batik.apps.svgbrowser.Main "$@"