[batik] 02/05: Remove bug805469.patch (fixed upstream http://svn.apache.org/viewvc?view=revision&revision=1687506)

[Christopher Stuart Hoskin]

This is an automated email from the git hooks/post-receive script.

mans0954 pushed a commit to branch master
in repository batik.

commit 1f580e439883de1acd82d12ed67712247ac64ff1
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Mon Sep 4 05:39:10 2017 +0100

    Remove bug805469.patch (fixed upstream  http://svn.apache.org/viewvc?view=revision&revision=1687506)
---
 debian/changelog               |  2 ++
 debian/patches/bug805469.patch | 21 ---------------------
 debian/patches/series          |  2 --
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 91ccf1b..5929101 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ batik (1.9-1) UNRELEASED; urgency=medium
     classpaths as appropriate for Debian (Closes: #605063)
   * Update Standards-Version from 3.9.8 to 4.0.0 (no change required)
   * Update 06_fix_paths_in_policy_files.patch 
+  * Remove bug805469.patch (fixed upstream 
+    http://svn.apache.org/viewvc?view=revision&revision=1687506)
 
  -- Christopher Hoskin <mans0954 at debian.org>  Sun, 03 Sep 2017 16:39:56 +0100
 
diff --git a/debian/patches/bug805469.patch b/debian/patches/bug805469.patch
deleted file mode 100644
index ccbcfa7..0000000
--- a/debian/patches/bug805469.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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());
diff --git a/debian/patches/series b/debian/patches/series
index 593d361..8b1e865 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-#06_fix_paths_in_policy_files.patch
 #source-1.5.patch
-#bug805469.patch
 06_fix_paths_in_policy_files.patch
 classpath.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/batik.git