[freeplane] 03/07: update patches for 1.6.10

[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 85dcb2c081fb34eb361b50a2c00ec386a6c47a23
Author: Felix Natter <fnatter at gmx.net>
Date:   Sat Nov 4 10:01:38 2017 +0100

    update patches for 1.6.10
---
 debian/patches/10_build_usr_share_java.patch | 72 +++++++---------------------
 1 file changed, 17 insertions(+), 55 deletions(-)

diff --git a/debian/patches/10_build_usr_share_java.patch b/debian/patches/10_build_usr_share_java.patch
index fb6befc..7a635fa 100644
--- a/debian/patches/10_build_usr_share_java.patch
+++ b/debian/patches/10_build_usr_share_java.patch
@@ -19,11 +19,14 @@ Last-Update: 2016-02-04
  
  allprojects {
      // in a multi-project setup, all projects must have the same version number!
-@@ -20,23 +20,45 @@
-                        rootDir.path + "/freeplane_plugin_jsyntaxpane/lib",
-                        rootDir.path + "/freeplane_plugin_latex/lib",
-                        rootDir.path + "/freeplane_plugin_svg/lib"]
-+        flatDir name: '/usr/share/java', dir: '/usr/share/java'
+@@ -15,26 +15,45 @@
+ 		maven { url "http://www.knopflerfish.org/releases/6.1.0/maven2" }
+         // this is necessary to grab both binary and source jars
+         // for local (git) dependencies
+-        flatDir name: 'localGitDepsRepository',
+-                dirs: [rootDir.path + "/freeplane/lib",
+-                       rootDir.path + "/freeplane_plugin_jsyntaxpane/lib"]
++	flatDir name: '/usr/share/java', dir: '/usr/share/java'
      }
  
  }
@@ -70,7 +73,7 @@ Last-Update: 2016-02-04
  }
  
  def filterAndExternalizePluginDependencies(runtime_files) {
-@@ -82,12 +104,6 @@
+@@ -80,12 +99,6 @@
        failOnError = false  
      }
  
@@ -83,7 +86,7 @@ Last-Update: 2016-02-04
      dependencies {
          testCompile 'junit:junit:4.11'
          testCompile 'org.assertj:assertj-core:2.6.0'
-@@ -110,14 +126,9 @@
+@@ -108,14 +121,9 @@
  // OSGi projects (/plugin/, freeplane) need this for compilation (e.g. resolve Bundle),
  // and freeplane_framework needs to copy it to BUILD/framework.jar
  configure(subprojects.findAll {it.name =~ /plugin/ || it.name =~ /^freeplane$/ || it.name =~ /^freeplane_framework$/}){
@@ -100,7 +103,7 @@ Last-Update: 2016-02-04
      }
  }
  
-@@ -130,11 +141,13 @@
+@@ -128,11 +136,13 @@
      else
         ext.pluginid = project.name.replace("freeplane_plugin_", "org.freeplane.plugin.")
  
@@ -119,7 +122,7 @@ Last-Update: 2016-02-04
  
      task filterOSGiManifestForEclipse(type: Copy) {
          from('build/tmp/jar/MANIFEST.MF') {
-@@ -186,18 +199,9 @@
+@@ -184,18 +194,9 @@
  configure(subprojects.findAll {it.name =~ /plugin/ }) {
  
      task copyOSGiJars(type: Copy) {
@@ -148,10 +151,10 @@ Last-Update: 2016-02-04
  dependencies {
  	
 -	mergedViewerDependencies 'org.dpolivaev.mnemonicsetter:mnemonicsetter:0.5'
--	mergedViewerDependencies ':kitfox-svg-salamander-1.1.1-p1'
+-	compile ':kitfox-svg-salamander-1.1.1-p1'
 +	//mergedViewerDependencies 'org.dpolivaev.mnemonicsetter:mnemonicsetter:0.5'
 +	compile 'org.dpolivaev.mnemonicsetter:mnemonicsetter:0.5'
-+	//mergedViewerDependencies ':kitfox-svg-salamander-1.1.1-p1'
++	//compile ':kitfox-svg-salamander-1.1.1-p1'
 +	compile ':svgSalamander'
  	
      compile project(':JOrtho_0.4_freeplane')
@@ -229,18 +232,6 @@ Last-Update: 2016-02-04
  }
  
  jar {
---- a/freeplane_plugin_latex/build.gradle
-+++ b/freeplane_plugin_latex/build.gradle
-@@ -1,8 +1,7 @@
- dependencies {
-     compile project(':freeplane')
-     compile project(':freeplane_plugin_jsyntaxpane')
--    // from flatDir "localGitDepsRepository" (jlatexmath-1.0.3 is not in maven!)
--    compile ':jlatexmath-1.0.3'
-+    compile ':jlatexmath'
- }
- 
- jar {
 --- a/freeplane_plugin_openmaps/build.gradle
 +++ b/freeplane_plugin_openmaps/build.gradle
 @@ -8,7 +8,8 @@
@@ -253,35 +244,6 @@ Last-Update: 2016-02-04
  }
  
  jar {
---- a/freeplane_plugin_svg/build.gradle
-+++ b/freeplane_plugin_svg/build.gradle
-@@ -20,11 +20,13 @@
-             'org.apache.xmlgraphics:batik-util:1.7',
-             'org.apache.xmlgraphics:batik-xml:1.7',
- 
--            'org.mozilla:rhino:1.7R4', // "js.jar"/librhino-java
-+            //'org.mozilla:rhino:1.7R4', // "js.jar"/librhino-java
-+	    'rhino:js:1.7R4',
- 
-             // cannot pull this due to broken "avalon" dependency
-             // (replaced by ./lib/pdf-transcoder.jar below):
-             //'org.apache.xmlgraphics:fop:1.1', // "fop.jar"/libfop-java
-+	    ':fop',
- 
-             // libxml-commons-external-java 1.4.01
-             //WRONG: 'org.apache.xmlgraphics:xmlgraphics-commons:1.4'
-@@ -34,10 +36,8 @@
-             // need to fix javax.xml.parsers.FactoryConfigurationError:
-             // Provider org.apache.xerces.jaxp.SAXParserFactoryImpl not found
-             // when starting from elipse:
-+	    // libxerces2-java:
-             'xerces:xercesImpl:2.11.0'
--
--    // from flatDir "localGitDepsRepository":
--    compile ':pdf-transcoder-1.0' // "fop.jar"/libfop-java
- }
- 
- jar {
 --- a/freeplane_plugin_script/build.gradle
 +++ b/freeplane_plugin_script/build.gradle
 @@ -2,10 +2,10 @@
@@ -303,15 +265,15 @@ Last-Update: 2016-02-04
 +++ b/dist.gradle
 @@ -33,7 +33,7 @@
  apply from: './win.dist.gradle'
- apply from: './bin.dist.gradle'
+ apply from: './mac.dist.gradle'
  apply from: './src.dist.gradle'
 -apply from: './linux-packages.gradle'
 +//apply from: './linux-packages.gradle'
  
  // meta task
  task dist {
-@@ -45,7 +45,7 @@
-     dependsOn macDist
+@@ -44,7 +44,7 @@
+     dependsOn windowsPortableInstaller
      dependsOn gitinfoDist
      dependsOn historyDist
 -    dependsOn freeplaneDeb

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