[freeplane] 01/01: Revert "1.5.18-2: include runtime dependencies for SVG plugin"

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository freeplane.

commit 111410ff501f57ee202fdc56e9c53d97f10270d8
Author: Felix Natter <fnatter at gmx.net>
Date:   Sat Apr 1 15:41:10 2017 +0200

    Revert "1.5.18-2: include runtime dependencies for SVG plugin"
    
    This reverts commit bd9473fe5de7cd81487de27b717462277df737cf.
---
 debian/changelog                             |  8 --------
 debian/patches/10_build_usr_share_java.patch | 24 ++----------------------
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 56bb9b6..db00a6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,3 @@
-freeplane (1.5.18-2) experimental; urgency=medium
-
-  * include avalon-framework.jar and ... explicitly in svg plugin
-    dependencies so that they are included in the generated MANIFEST
-    (Closes: #856058, LP: #1666672)
-
- -- Felix Natter <fnatter at gmx.net>  Sun, 12 Mar 2017 17:00:17 +0100
-
 freeplane (1.5.18-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/10_build_usr_share_java.patch b/debian/patches/10_build_usr_share_java.patch
index 7686279..fbfc6f6 100644
--- a/debian/patches/10_build_usr_share_java.patch
+++ b/debian/patches/10_build_usr_share_java.patch
@@ -246,7 +246,7 @@ Last-Update: 2016-02-04
  jar {
 --- a/freeplane_plugin_svg/build.gradle
 +++ b/freeplane_plugin_svg/build.gradle
-@@ -20,11 +20,18 @@
+@@ -20,11 +20,13 @@
              'org.apache.xmlgraphics:batik-util:1.7',
              'org.apache.xmlgraphics:batik-xml:1.7',
  
@@ -258,15 +258,10 @@ Last-Update: 2016-02-04
              // (replaced by ./lib/pdf-transcoder.jar below):
              //'org.apache.xmlgraphics:fop:1.1', // "fop.jar"/libfop-java
 +	    ':fop',
-+	    // these have to be loaded explicitly on Debian/Ubuntu,
-+	    // otherwise you get runtime errors on PDF export!
-+	    ':avalon-framework', // dep of libfop-java??
-+	    ':commons-logging', // dep of libbatik-java??
-+	    ':xmlgraphics-commons', // dep of libfop-java??
  
              // libxml-commons-external-java 1.4.01
              //WRONG: 'org.apache.xmlgraphics:xmlgraphics-commons:1.4'
-@@ -34,10 +41,8 @@
+@@ -34,10 +36,8 @@
              // need to fix javax.xml.parsers.FactoryConfigurationError:
              // Provider org.apache.xerces.jaxp.SAXParserFactoryImpl not found
              // when starting from elipse:
@@ -278,18 +273,3 @@ Last-Update: 2016-02-04
  }
  
  jar {
-@@ -62,7 +67,13 @@
-                       org.freeplane.features.*,
-                       org.freeplane.main.*,
-                       org.freeplane.n3.*,
--                      org.freeplane.view.*
-+                      org.freeplane.view.*,
-+                      org.apache.commons.io,
-+                      org.apache.commons.io.comparator,
-+                      org.apache.commons.io.filefilter,
-+                      org.apache.commons.io.input,
-+                      org.apache.commons.io.monitor,
-+                      org.apache.commons.io.output
-                       """
-         instruction 'Import-Package', imports.replaceAll("\\s+", "")
-         instruction 'Export-Package', ''

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