[scilab] 14/29: Drop patch for the batik 1.8 api

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository scilab.

commit 3818952e317cc727278ad38831b8ed8826f3bb20
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Wed Nov 15 20:24:23 2017 +0100

    Drop patch for the batik 1.8 api
---
 debian/changelog              |  1 +
 debian/patches/batik-1.8.diff | 16 ----------------
 debian/patches/series         |  1 -
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2171aa7..ff7c87b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ scilab (6.0.0-1) UNRELEASED; urgency=medium
     - Refresh patch to add a missing lib to the linker list.
     - Drop patch to adapt the xmlgraphics api : useless now.
     - Drop patch to adapt the fop api to 2.0 : we have 2.2.
+    - Drop patch to adapt the batik api to 1.8 : we have 1.9.
 
  -- Julien Puydt <julien.puydt at laposte.net>  Tue, 14 Nov 2017 16:46:25 +0100
 
diff --git a/debian/patches/batik-1.8.diff b/debian/patches/batik-1.8.diff
deleted file mode 100644
index 80de2de..0000000
--- a/debian/patches/batik-1.8.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: adapt to batik 1.8 API
- New path for class SAXSVGDocumentFactory.
-Author: Gilles Filippini <pini at debian.org>
-Index: scilab-5.5.2/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
-===================================================================
---- scilab-5.5.2.orig/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
-+++ scilab-5.5.2/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
-@@ -28,7 +28,7 @@ import org.apache.batik.bridge.DocumentL
- import org.apache.batik.bridge.GVTBuilder;
- import org.apache.batik.bridge.UserAgent;
- import org.apache.batik.bridge.UserAgentAdapter;
--import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
-+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
- import org.apache.batik.gvt.GraphicsNode;
- import org.apache.batik.util.XMLResourceDescriptor;
- import org.scilab.forge.jlatexmath.ParseException;
diff --git a/debian/patches/series b/debian/patches/series
index 7244947..2d3914b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,6 @@ disable-xcos-dep-check.diff
 jh.diff
 depend-scicos.diff
 missing-lib.diff
-batik-1.8.diff
 jvm-archdir-ppc64le.diff
 libjogl2-java-2.3.2.diff
 hdf5-1.10-api.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/scilab.git