[freeplane] 03/12: commit patches for 1.5.11
Felix Natter
fnatter-guest at moszumanska.debian.org
Sat Jul 16 11:42:46 UTC 2016
This is an automated email from the git hooks/post-receive script.
fnatter-guest pushed a commit to branch master
in repository freeplane.
commit 05c4127717dbdb103851c65ea74e20e5d06a5125
Author: Felix Natter <fnatter at gmx.net>
Date: Sat Jul 16 13:21:16 2016 +0200
commit patches for 1.5.11
---
debian/patches/10_build_usr_share_java.patch | 271 ++++++++++++++
debian/patches/10_libraries_properties.patch | 109 ------
debian/patches/15_libraries_manifest.patch | 106 ------
debian/patches/20_freeplane_sh.patch | 15 +-
debian/patches/21_freeplane_sh_fix_spaces.patch | 22 --
debian/patches/30_disable_update_check.patch | 26 ++
debian/patches/40_allow_usj_codebase.patch | 26 ++
debian/patches/40_no_winmac.patch | 12 -
debian/patches/50_no_copy_files.patch | 34 --
debian/patches/60_no_license_latex.patch | 12 -
debian/patches/70_skip_bugreport.patch | 14 -
debian/patches/80_no_update_check.patch | 67 ----
debian/patches/92_fix_old_manifest.patch | 15 -
debian/patches/93_jgoodies1.6.patch | 456 ------------------------
debian/patches/95_run_jflex.patch | 29 --
debian/patches/97_jmapviewer1.11.patch | 152 --------
debian/patches/98_groovy2.4fix.patch | 16 -
debian/patches/series | 16 +-
18 files changed, 337 insertions(+), 1061 deletions(-)
diff --git a/debian/patches/10_build_usr_share_java.patch b/debian/patches/10_build_usr_share_java.patch
new file mode 100644
index 0000000..2c54a95
--- /dev/null
+++ b/debian/patches/10_build_usr_share_java.patch
@@ -0,0 +1,271 @@
+Description: change dependencies to /usr/share/java, where necessary,
+ do not copy all dependencies to build/libs (eclipse hack);
+ dop not copy debian jars to /usr/share/freeplane/**;
+ copy only plugin-${project.version}.jar for plugins;
+ externalize debian jars with a relative path in OSGi MANIFEST.MFs
+ see README.source for an explanation of the (changes to the) build system
+Author: Felix Natter <fnatter at gmx.net>
+Forwarded: not-needed
+Last-Update: 2016-02-04
+--- a/build.gradle
++++ b/build.gradle
+@@ -7,30 +7,46 @@
+ ext.globalBuild = rootDir.path + '/BUILD'
+
+ repositories {
+- maven { url "http://dl.bintray.com/freeplane/freeplane" }
+- // 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",
+- rootDir.path + "/freeplane_plugin_svg/lib"]
++ flatDir name: '/usr/share/java', dir: '/usr/share/java'
+ }
+
+ }
+
++def isDebianJar(File jar) {
++ def ret = jar.path.startsWith("/usr/share/java/") ||
++ jar.path.startsWith("/usr/share/maven-repo/")
++ return ret;
++}
++
++def relpath(File basePath, File targetPath) {
++ def relPath = ""
++ // targetPath is either '/usr/share/java/**' or '/usr/share/maven-repo/**'!
++ def commonPrefix = '/usr/share'
++ def parent = basePath
++ while (parent.path != commonPrefix) {
++ parent = parent.parentFile
++ relPath += '../'
++ }
++ def targetPathRel = targetPath.path.replaceFirst(/^${commonPrefix}/, '').substring(1)
++ relPath += targetPathRel
++}
++
++
+ // this is used for (linux) packages, where the dependencies
+ // live on the file system (/usr/share/java/*.jar on Debian):
+ def externalizeJar(File jar) {
+- // do not externalize, jars are copied over to /BUILD
+- // in development workflow!
+- return "lib/${jar.name}"
++ final BUNDLE_PATH = "/usr/share/freeplane/core/org.freeplane.core/"
++ if (isDebianJar(jar)) {
++ return relpath(new File(BUNDLE_PATH), jar)
++ } else {
++ return "lib/${jar.name}"
++ }
+ }
+
+ // this is overridden in linux packages where this might be named
+ // knopflerfish-framework.jar
+ def isKnopflerfishJar(fileName) {
+- return fileName.startsWith('framework-') &&
+- fileName.endsWith('.jar');
++ return fileName == 'knopflerfish-framework.jar'
+ }
+
+ def filterAndExternalizePluginDependencies(runtime_files) {
+@@ -76,12 +92,6 @@
+ failOnError = false
+ }
+
+- repositories {
+- maven {
+- url "http://repo1.maven.org/maven2"
+- }
+- }
+-
+ dependencies {
+ testCompile group: 'junit', name: 'junit', version: '4.11'
+ }
+@@ -103,14 +113,10 @@
+ // 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$/}){
+- repositories {
+- maven {
+- url 'http://www.knopflerfish.org/maven2/'
+- }
+- }
+
+ dependencies {
+- compile group: 'org.knopflerfish', name:'framework', version: '7.1.2'
++ //compile group: 'org.knopflerfish', name:'framework', version: '7.1.2'
++ compile ':knopflerfish-framework'
+ }
+ }
+
+@@ -123,11 +129,13 @@
+ else
+ ext.pluginid = project.name.replace("freeplane_plugin_", "org.freeplane.plugin.")
+
+- task copyDeps(type: Copy) {
+- from project.configurations.runtime
+- into "$buildDir/libs"
+- }
+- jar.dependsOn copyDeps
++ // this is a hack for eclipse which does not allow to export jars
++ // outside of the project directory!
++ //task copyDeps(type: Copy) {
++ // from project.configurations.runtime
++ // into "$buildDir/libs"
++ //}
++ //jar.dependsOn copyDeps
+
+ task filterOSGiManifestForEclipse(type: Copy) {
+ from('build/tmp/jar/MANIFEST.MF') {
+@@ -179,18 +187,11 @@
+ configure(subprojects.findAll {it.name =~ /plugin/ }) {
+
+ task copyOSGiJars(type: Copy) {
+- from ("$buildDir/libs") {
+- include("*.jar")
+- // TODO: this is redundant with regard to 'filterPluginDeps' (see above)!
+- exclude('framework-*.jar')
+- exclude('knopflerfish-framework*.jar')
+- exclude('freeplane-' + project.version + '.jar')
+- exclude('freeplane_plugin_*-' + project.version + '.jar')
+- }
+- from ('lib') {
+- include("*.jar")
+- exclude('*-sources.jar')
+- }
++
++ from ("$buildDir/libs") {
++ include("plugin-${project.version}.jar")
++ }
++
+ into(globalBuild + '/plugins/' + pluginid + '/lib/')
+ }
+
+--- a/freeplane/build.gradle
++++ b/freeplane/build.gradle
+@@ -13,19 +13,18 @@
+ 'commons-io:commons-io:2.4',
+ 'commons-codec:commons-codec:1.7',
+ 'com.jgoodies:jgoodies-forms:1.6.0',
+- 'com.jgoodies:jgoodies-common:1.4.0'
++ //'com.jgoodies:jgoodies-common:1.4.0',
++ ':idw'
+
+ compile ('com.lightdev.app.shtm.simplyhtml:SimplyHTML:0.16.17') {
+ exclude module: 'javahelp'
+ exclude module: 'mnemonicsetter'
+ }
+
+- testCompile 'junit:junit:4.12',
+- 'org.hamcrest:hamcrest-all:1.3',
+- 'org.mockito:mockito-all:1.10.19'
++ //testCompile 'junit:junit:4.12',
++ // 'org.hamcrest:hamcrest-all:1.3',
++ // 'org.mockito:mockito-all:1.10.19'
+
+- // from flatDir "localGitDepsRepository":
+- compile ':idw-gpl-1.6.1'
+ }
+
+ sourceSets {
+@@ -179,16 +178,17 @@
+ }
+
+ task copyOSGiJars(type: Copy) {
+- from ("$buildDir/libs") {
+- include("*.jar")
+- exclude('framework-*.jar')
+- exclude('freeplane-*.jar')
+- exclude('mnemonicsetter-*.jar')
+-
++ from (configurations.runtime.files) {
++ // do not copy debian jars!
++ exclude {
++ FileTreeElement jarFileTreeElement ->
++ isDebianJar(jarFileTreeElement.file)
++ }
+ }
+- from ('lib') {
+- include("*.jar")
+- exclude('*-sources.jar')
++ from ("$buildDir/libs") {
++ include("*.jar")
++ exclude('framework-*.jar')
++ exclude('freeplane-*.jar')
+ }
+ into(globalBuild + '/core/' + pluginid + '/lib/')
+ }
+@@ -301,7 +301,7 @@
+ jar.dependsOn viewerJar
+ jar.dependsOn editorJar
+ jar.dependsOn osgiJar
+-jar.dependsOn copyDeps
++//jar.dependsOn copyDeps
+ build.dependsOn copyOSGiJars
+ build.dependsOn copyOSGiManifest
+ build.dependsOn copyExternalResources
+--- a/freeplane_plugin_jsyntaxpane/build.gradle
++++ b/freeplane_plugin_jsyntaxpane/build.gradle
+@@ -2,7 +2,8 @@
+ compile project(':freeplane')
+
+ // from flatDir "localGitDepsRepository":
+- compile ':jsyntaxpane-0.9.6~r156-5' // from the Debian "libjsyntaxpane-java" package
++ //compile ':jsyntaxpane-0.9.6~r156-5' // from the Debian "libjsyntaxpane-java" package
++ compile ':jsyntaxpane'
+ }
+
+ jar {
+--- a/freeplane_plugin_latex/build.gradle
++++ b/freeplane_plugin_latex/build.gradle
+@@ -1,7 +1,8 @@
+ dependencies {
+ compile project(':freeplane')
+ compile project(':freeplane_plugin_jsyntaxpane')
+- compile group: 'org.scilab.forge', name: 'jlatexmath', version:'1.0.2'
++ //compile group: 'org.scilab.forge', name: 'jlatexmath', version:'1.0.2'
++ compile ':jlatexmath'
+ }
+
+ jar {
+--- a/freeplane_plugin_openmaps/build.gradle
++++ b/freeplane_plugin_openmaps/build.gradle
+@@ -8,7 +8,8 @@
+ dependencies {
+ compile project(':freeplane')
+
+- compile 'org.openstreetmap.jmapviewer:jmapviewer:1.14'
++ //compile 'org.openstreetmap.jmapviewer:jmapviewer:1.14'
++ compile ':jmapviewer'
+ }
+
+ 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 {
diff --git a/debian/patches/10_libraries_properties.patch b/debian/patches/10_libraries_properties.patch
deleted file mode 100644
index a801cab..0000000
--- a/debian/patches/10_libraries_properties.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-changes paths to dependency jars to /usr/share/java/...
---- a/freeplane/ant/ant.properties
-+++ b/freeplane/ant/ant.properties
-@@ -1,14 +1,17 @@
--freeplane.ext.lib = ${workspace}/freeplane/lib
-+freeplane.ext.lib = /usr/share/java
- freeplane.dist.lib = ${workspace}/freeplane/dist/lib
- freeplaneviewer.jar = ${freeplane.dist.lib}/freeplaneviewer.jar
- freeplaneeditor.jar = ${freeplane.dist.lib}/freeplaneeditor.jar
- freeplaneosgi.jar = ${freeplane.dist.lib}/freeplaneosgi.jar
- freeplanemac.jar = ${freeplane.ext.lib}/freeplanemac.jar
- freeplane.jars = ${freeplaneviewer.jar}:${freeplaneeditor.jar}:${freeplaneosgi.jar}:${freeplanemac.jar}
--commons-lang.jar = ${freeplane.ext.lib}/commons-lang-2.6.jar
--commons-codec.jar = ${freeplane.ext.lib}/commons-codec-1.7.jar
--commons-io.jar = ${freeplane.ext.lib}/commons-io-2.4.jar
--forms.jar = ${freeplane.ext.lib}/forms-1.2.1.jar
-+
-+commons-lang.jar = ${freeplane.ext.lib}/commons-lang.jar
-+# commons-codec 1.7!
-+commons-codec.jar = ${freeplane.ext.lib}/commons-codec.jar
-+commons-io.jar = ${freeplane.ext.lib}/commons-io.jar
-+forms.jar = ${freeplane.ext.lib}/jgoodies-forms.jar
- SimplyHTML.jar = ${freeplane.ext.lib}/SimplyHTML.jar
--jortho.jar = ${freeplane.ext.lib}/jortho.jar
--idwgpl.jar = ${freeplane.ext.lib}/idw-gpl.jar
-+#jortho.jar = ${freeplane.ext.lib}/jortho.jar
-+jortho.jar = ${workspace}/JOrtho_0.4_freeplane/dist/lib/jortho-0.4+fp1.1.1.jar
-+idwgpl.jar = ${freeplane.ext.lib}/idw.jar
---- a/freeplane_framework/ant/ant.properties
-+++ b/freeplane_framework/ant/ant.properties
-@@ -1,4 +1,4 @@
- launcher.dist.lib = ${workspace}/freeplane_framework/build
- freeplanelauncher.jar = ${launcher.dist.lib}/freeplanelauncher.jar
--framework.ext.lib = ${workspace}/freeplane_framework/lib
-+framework.ext.lib = /usr/share
- framework.jar = ${framework.ext.lib}/knopflerfish/framework.jar
---- a/freeplane_plugin_bugreport/ant/ant.properties
-+++ b/freeplane_plugin_bugreport/ant/ant.properties
-@@ -1 +1 @@
--plugin.ext.lib = lib
-+plugin.ext.lib = /usr/share/java
---- a/freeplane_plugin_help/ant/ant.properties
-+++ b/freeplane_plugin_help/ant/ant.properties
-@@ -1,2 +1,2 @@
--plugin.ext.lib = lib
-+plugin.ext.lib = /usr/share/java
- jhall.jar = ${plugin.ext.lib}/jhall.jar
---- a/freeplane_plugin_latex/ant/ant.properties
-+++ b/freeplane_plugin_latex/ant/ant.properties
-@@ -1,2 +1,2 @@
--plugin.ext.lib = lib
-+plugin.ext.lib = /usr/share/java
- jlatexmath.jar = ${plugin.ext.lib}/jlatexmath.jar
---- a/freeplane_plugin_script/ant/ant.properties
-+++ b/freeplane_plugin_script/ant/ant.properties
-@@ -1,3 +1,3 @@
--plugin.ext.lib = lib
-+plugin.ext.lib = /usr/share/java
- groovy.jar = ${plugin.ext.lib}/groovy-all.jar
- jsyntaxpane.jar = ${plugin.ext.lib}/jsyntaxpane.jar
---- a/freeplane_plugin_svg/ant/ant.properties
-+++ b/freeplane_plugin_svg/ant/ant.properties
-@@ -1,23 +1,18 @@
--plugin.ext.lib = lib
-+plugin.ext.lib = /usr/share/java
-
- # Batik - xml.apache.org SVG Library (batik-all.jar)
--batik.jars = ${plugin.ext.lib}/batik-awt-util.jar:${plugin.ext.lib}/batik-bridge.jar:${plugin.ext.lib}/batik-css.jar:${plugin.ext.lib}/batik-dom.jar:${plugin.ext.lib}/batik-extension.jar:${plugin.ext.lib}/batik-ext.jar:${plugin.ext.lib}/batik-codec.jar:${plugin.ext.lib}/batik-anim.jar:${plugin.ext.lib}/batik-gui-util.jar:${plugin.ext.lib}/batik-gvt.jar:${plugin.ext.lib}/batik-parser.jar:${plugin.ext.lib}/batik-script.jar:${plugin.ext.lib}/batik-svg-dom.jar:${plugin.ext.lib}/batik-svggen [...]
-+batik.jars = ${plugin.ext.lib}/batik-all.jar
-
- # Rhino - JavaScript engine written in Java
- js.jar = ${plugin.ext.lib}/js.jar
- # FOP - XML to PDF Translator (fop.jar)
--pdf-transcoder.jar = ${plugin.ext.lib}/pdf-transcoder.jar
-+pdf-transcoder.jar = ${plugin.ext.lib}/fop.jar
-
--pdf.jars = ${pdf-transcoder.jar}
--# Possibly also needed to work properly under Debian/Ubuntu:
--# /usr/share/java/avalon-framework.jar
--# /usr/share/java/commons-logging.jar
--# /usr/share/java/commons-io.jar
--# /usr/share/java/xmlgraphics-commons.jar
-+pdf.jars = ${pdf-transcoder.jar}:${plugin.ext.lib}/avalon-framework.jar:${plugin.ext.lib}/commons-logging.jar:${plugin.ext.lib}/commons-io.jar:${plugin.ext.lib}/xmlgraphics-commons.jar
-
- # Xerces2 - Validating XML parser for Java with DOM level 3 support
- # (xercesImpl.jar and xmlParserAPIs.jar)
--xerces.jar = ${plugin.ext.lib}/xerces_2_5_0.jar
-+xerces.jar = ${plugin.ext.lib}/xercesImpl.jar
- xml-apis-ext.jar = ${plugin.ext.lib}/xml-apis-ext.jar
- # Xalan2 - XSL Transformations (XSLT) processor in Java
- xml-apis.jar = ${plugin.ext.lib}/xml-apis.jar
---- a/freeplane_plugin_openmaps/ant/ant.properties
-+++ b/freeplane_plugin_openmaps/ant/ant.properties
-@@ -1,2 +1,2 @@
--plugin.ext.lib = lib
--JMapViewer.jar = ${plugin.ext.lib}/JMapViewer.jar
-\ No newline at end of file
-+plugin.ext.lib = /usr/share/java
-+JMapViewer.jar = ${plugin.ext.lib}/jmapviewer.jar
-\ No newline at end of file
---- a/freeplane_plugin_workspace/ant/ant.properties
-+++ b/freeplane_plugin_workspace/ant/ant.properties
-@@ -1,3 +1,3 @@
--plugin.ext.lib = lib
--jgoodies.jar = ${workspace}/freeplane/dist/org.freeplane.core/lib/forms-1.2.1.jar
--commons_io.jar = ${workspace}/freeplane/dist/org.freeplane.core/lib/commons-io-2.4.jar
-+plugin.ext.lib = /usr/share/java
-+jgoodies.jar = ${plugin.ext.lib}/jgoodies-forms.jar
-+commons_io.jar = ${plugin.ext.lib}/commons-io.jar
diff --git a/debian/patches/15_libraries_manifest.patch b/debian/patches/15_libraries_manifest.patch
deleted file mode 100644
index dea9f7f..0000000
--- a/debian/patches/15_libraries_manifest.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-adapts jar paths in core MANIFEST as well as plugin MANIFESTs
---- a/freeplane/META-INF/MANIFEST.MF
-+++ b/freeplane/META-INF/MANIFEST.MF
-@@ -7,14 +7,15 @@
- lib/freeplaneeditor.jar,
- lib/freeplanemac.jar,
- lib/freeplaneosgi.jar,
-- lib/commons-lang-2.6.jar,
-- lib/commons-io-2.4.jar,
-- lib/forms-1.2.1.jar,
-- lib/gnu-regexp-1.1.4.jar,
-- lib/SimplyHTML.jar,
-- lib/jortho.jar,
-- lib/idw-gpl.jar,
-- lib/commons-codec-1.7.jar
-+ ../../../java/commons-lang.jar,
-+ ../../../java/commons-io.jar,
-+ ../../../java/jgoodies-forms.jar,
-+ ../../../java/jgoodies-common.jar,
-+ ../../../java/gnu-regexp.jar,
-+ ../../../java/SimplyHTML.jar,
-+ ../../../java/jortho.jar,
-+ ../../../java/idw.jar,
-+ ../../../java/commons-codec.jar
- Bundle-Activator: org.freeplane.main.osgi.Activator
- Import-Package: org.osgi.framework,
- org.osgi.service.url;version="1.0.0"
---- a/freeplane_plugin_help/META-INF/MANIFEST.MF
-+++ b/freeplane_plugin_help/META-INF/MANIFEST.MF
-@@ -8,5 +8,5 @@
- Bundle-RequiredExecutionEnvironment: J2SE-1.5
- Require-Bundle: org.freeplane.core;bundle-version="1.0.1"
- Bundle-ClassPath: lib/plugin.jar,
-- lib/jhall.jar
-+ ../../../java/jhall.jar
- Export-Package: org.freeplane.plugin.help;uses:="org.freeplane.core.ui,org.freeplane.core.controller,org.osgi.framework"
---- a/freeplane_plugin_latex/META-INF/MANIFEST.MF
-+++ b/freeplane_plugin_latex/META-INF/MANIFEST.MF
-@@ -10,4 +10,4 @@
- Require-Bundle: org.freeplane.core;bundle-version="1.0.1",
- org.freeplane.plugin.script;bundle-version="1.0.1"
- Bundle-ClassPath: lib/plugin.jar,
-- lib/jlatexmath.jar
-+ ../../../java/jlatexmath.jar
---- a/freeplane_plugin_script/META-INF/MANIFEST.MF
-+++ b/freeplane_plugin_script/META-INF/MANIFEST.MF
-@@ -8,8 +8,8 @@
- Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- Require-Bundle: org.freeplane.core;bundle-version="1.0.1"
- Bundle-ClassPath: lib/plugin.jar,
-- lib/jsyntaxpane.jar,
-- lib/groovy-all.jar
-+ ../../../java/jsyntaxpane.jar,
-+ ../../../java/groovy-all.jar
- Export-Package: jsyntaxpane,
- jsyntaxpane.actions,
- jsyntaxpane.actions.gui,
---- a/freeplane_plugin_svg/META-INF/MANIFEST.MF
-+++ b/freeplane_plugin_svg/META-INF/MANIFEST.MF
-@@ -7,27 +7,14 @@
- Import-Package: org.osgi.framework;version="1.3.0"
- Bundle-RequiredExecutionEnvironment: J2SE-1.5
- Require-Bundle: org.freeplane.core;bundle-version="1.0.1"
--Bundle-ClassPath: lib/batik-awt-util.jar,
-- lib/batik-bridge.jar,
-- lib/batik-css.jar,
-- lib/batik-dom.jar,
-- lib/batik-ext.jar,
-- lib/batik-extension.jar,
-- lib/batik-gui-util.jar,
-- lib/batik-gvt.jar,
-- lib/batik-parser.jar,
-- lib/batik-script.jar,
-- lib/batik-anim.jar,
-- lib/batik-codec.jar,
-- lib/batik-svg-dom.jar,
-- lib/batik-svggen.jar,
-- lib/batik-swing.jar,
-- lib/batik-transcoder.jar,
-- lib/batik-util.jar,
-- lib/batik-xml.jar,
-- lib/js.jar,
-- lib/pdf-transcoder.jar,
-- lib/xerces_2_5_0.jar,
-- lib/xml-apis.jar,
-+Bundle-ClassPath: ../../../java/batik-all.jar,
-+ ../../../java/js.jar,
-+ ../../../java/fop.jar,
-+ ../../../java/avalon-framework.jar,
-+ ../../../java/commons-logging.jar,
-+ ../../../java/commons-io.jar,
-+ ../../../java/xmlgraphics-commons.jar,
-+ ../../../java/xercesImpl.jar,
-+ ../../../java/xml-apis.jar,
- lib/plugin.jar,
-- lib/xml-apis-ext.jar
-+ ../../../java/xml-apis-ext.jar
---- a/freeplane_plugin_openmaps/META-INF/MANIFEST.MF
-+++ b/freeplane_plugin_openmaps/META-INF/MANIFEST.MF
-@@ -6,5 +6,5 @@
- Bundle-Activator: org.freeplane.plugin.openmaps.Activator
- Import-Package: org.osgi.framework;version="1.3.0"
- Bundle-RequiredExecutionEnvironment: J2SE-1.5
--Bundle-ClassPath: lib/JMapViewer.jar, lib/plugin.jar
-+Bundle-ClassPath: ../../../java/jmapviewer.jar, lib/plugin.jar
- Require-Bundle: org.freeplane.core;bundle-version="1.0.1"
diff --git a/debian/patches/20_freeplane_sh.patch b/debian/patches/20_freeplane_sh.patch
index d0345c5..a1f4ce4 100644
--- a/debian/patches/20_freeplane_sh.patch
+++ b/debian/patches/20_freeplane_sh.patch
@@ -1,4 +1,9 @@
-JAVACMD->JAVA_CMD, use java-wrappers.sh instead of findjava if available, maybe more
+Description: JAVACMD->JAVA_CMD, use java-wrappers.sh instead of findjava
+ if available, set org.freeplane.basedirectory to /usr/share/freeplane
+ (not the path to the knopflerfish jar)
+Author: Felix Natter <fnatter at gmx.net>
+Forwarded: no
+Last-Update: 2016-05-05
--- a/freeplane_framework/script/freeplane.sh
+++ b/freeplane_framework/script/freeplane.sh
@@ -5,6 +5,13 @@
@@ -83,7 +88,7 @@ JAVACMD->JAVA_CMD, use java-wrappers.sh instead of findjava if available, maybe
+if [ -r /usr/lib/java-wrappers/java-wrappers.sh ]
+then # the Debian method
+ . /usr/lib/java-wrappers/java-wrappers.sh
-+ require_java_runtime java6
++ require_java_runtime java7
+else
+ findjava
+ if [ $? -ne 0 ]
@@ -93,21 +98,23 @@ JAVACMD->JAVA_CMD, use java-wrappers.sh instead of findjava if available, maybe
fi
output_debug_info
-@@ -174,7 +188,7 @@
+@@ -174,7 +188,8 @@
#JAVA_OPTS="-Dorg.freeplane.nosplash=true $JAVA_OPTS"
_debug "Calling: "\
-"${JAVACMD}" -Xmx512m\
+"${JAVA_CMD}" -Xmx512m\
++ "-Dorg.freeplane.basedirectory=${freedir}"\
"-Dorg.freeplane.userfpdir=$userfpdir"\
"-Dorg.freeplane.old_userfpdir=$old_userfpdir"\
"-Dorg.freeplane.globalresourcedir=${freedir}/resources"\
-@@ -185,7 +199,7 @@
+@@ -186,7 +201,8 @@
( echo "${DEBUG}" | grep -qe "exit" ) && exit 0 # do not start Freeplane
# now actually launch Freeplane
-"${JAVACMD}" -Xmx512m\
+"${JAVA_CMD}" -Xmx512m\
++ "-Dorg.freeplane.basedirectory=${freedir}"\
"-Dorg.freeplane.userfpdir=$userfpdir"\
"-Dorg.freeplane.old_userfpdir=$old_userfpdir"\
"-Dorg.freeplane.globalresourcedir=${freedir}/resources"\
diff --git a/debian/patches/21_freeplane_sh_fix_spaces.patch b/debian/patches/21_freeplane_sh_fix_spaces.patch
deleted file mode 100644
index ed418fb..0000000
--- a/debian/patches/21_freeplane_sh_fix_spaces.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Fix behavior of freeplane.sh (/usr/bin/freeplane)
- when mind map files with spaces are passed
-Author: Felix Natter <fnatter at gmx.net>
-Applied-Upstream: 1.3/1.4, https://github.com/freeplane/freeplane/commit/762a0710eef7b7fe4fb7fc0b7584cdc01ba92da9
-Last-Update: 2015-03-29
---- a/freeplane_framework/script/freeplane.sh
-+++ b/freeplane_framework/script/freeplane.sh
-@@ -195,7 +195,7 @@
- $JAVA_OPTS\
- $xdockname\
- -jar "${freedir}/freeplanelauncher.jar"\
-- $*
-+ "$@"
- ( echo "${DEBUG}" | grep -qe "exit" ) && exit 0 # do not start Freeplane
-
- # now actually launch Freeplane
-@@ -206,4 +206,4 @@
- $JAVA_OPTS\
- $xdockname\
- -jar "${freedir}/freeplanelauncher.jar"\
-- $*
-+ "$@"
diff --git a/debian/patches/30_disable_update_check.patch b/debian/patches/30_disable_update_check.patch
new file mode 100644
index 0000000..56197bc
--- /dev/null
+++ b/debian/patches/30_disable_update_check.patch
@@ -0,0 +1,26 @@
+Description: Disable update check (automatically and in menu)
+Author: Felix Natter <fnatter at gmx.net>
+Forwarded: not-needed
+Last-Update: 2016-02-04
+--- a/freeplane/viewer-resources/freeplane.properties
++++ b/freeplane/viewer-resources/freeplane.properties
+@@ -180,7 +180,7 @@
+ browsemode_initial_map=map.mm
+ bugTrackerLocation=http\://www.freeplane.org/bugs
+ center_selected_node=false
+-check_updates_automatically=true
++check_updates_automatically=false
+ compare_as_number=true
+ connector_alpha=200
+ connector_shape=CUBIC_CURVE
+--- a/freeplane/external-resources/xml/mindmapmodemenu.xml
++++ b/freeplane/external-resources/xml/mindmapmodemenu.xml
+@@ -463,7 +463,7 @@
+ <Entry builder="separator" />
+ </Entry>
+ <Entry name="help">
+- <Entry name="UpdateCheckAction" />
++ <!--<Entry name="UpdateCheckAction" />-->
+ <Entry builder="separator" />
+ <Entry name="web_resources">
+ <Entry name="OpenFreeplaneSiteAction" />
diff --git a/debian/patches/40_allow_usj_codebase.patch b/debian/patches/40_allow_usj_codebase.patch
new file mode 100644
index 0000000..f452f73
--- /dev/null
+++ b/debian/patches/40_allow_usj_codebase.patch
@@ -0,0 +1,26 @@
+Description: allow freeplane to access code from /usr/share/knopflerfish/*,
+ /usr/share/java/* and /usr/share/maven-repo/**
+Author: Felix Natter <fnatter at gmx.net>
+Forwarded: not-needed
+Last-Update: 2016-05-05
+--- a/freeplane_framework/script/freeplane.policy
++++ b/freeplane_framework/script/freeplane.policy
+@@ -2,6 +2,18 @@
+ permission java.security.AllPermission;
+ };
+
++grant codeBase "file:/usr/share/knopflerfish/*" {
++ permission java.security.AllPermission;
++};
++
++grant codeBase "file:/usr/share/java/*" {
++ permission java.security.AllPermission;
++};
++
++grant codeBase "file:/usr/share/maven-repo/-" {
++ permission java.security.AllPermission;
++};
++
+ grant {
+ permission java.lang.RuntimePermission "getClassLoader";
+ };
diff --git a/debian/patches/40_no_winmac.patch b/debian/patches/40_no_winmac.patch
deleted file mode 100644
index 9bd2e7c..0000000
--- a/debian/patches/40_no_winmac.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-don't build windows/mac installers
---- a/freeplane_framework/ant/build.xml
-+++ b/freeplane_framework/ant/build.xml
-@@ -488,7 +488,7 @@
- </checksum>
- </target>
-
-- <target name="copyDistFiles" depends="git_version_info, binzip, srczip, installer, portableinstaller, zip4mac, dmg4mac, javadoc">
-+ <target name="copyDistFiles" depends="git_version_info, binzip, srczip">
- <copy file="${workspace}/freeplane/doc/history_en.txt"
- todir="${dist}" />
- <copy file="${build}/gitinfo.txt"
diff --git a/debian/patches/50_no_copy_files.patch b/debian/patches/50_no_copy_files.patch
deleted file mode 100644
index 62c3d8e..0000000
--- a/debian/patches/50_no_copy_files.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-don't build some mac/win stuff, don't copy third-party libraries (they're not even included in freeplane_srcpure!)
---- a/freeplane/ant/build.xml
-+++ b/freeplane/ant/build.xml
-@@ -187,14 +187,16 @@
- </jar>
- </target>
-
-- <target name="dist" depends="jar, signjar, signjarinfo, buildmac">
-+ <target name="dist" depends="jar, signjar, signjarinfo">
- <!-- third party libs -->
- <mkdir dir="${freeplane.dist.lib}" />
-+<!--
- <copy todir="${freeplane.dist.lib}">
- <fileset dir="${freeplane.ext.lib}">
- <include name="*.jar" />
- </fileset>
- </copy>
-+-->
- <mkdir dir="${dist.resources}" />
- <copy todir="${dist.resources}">
- <fileset dir="external-resources"/>
---- a/freeplane_framework/ant/build.xml
-+++ b/freeplane_framework/ant/build.xml
-@@ -166,10 +166,6 @@
- <copy todir="${build}">
- <fileset dir="${script}" />
- <fileset file="${framework.jar}" />
-- <fileset file="${freeplanelauncher.jar}" />
-- <fileset file="windows-icons/freeplaneIcons.dll" />
-- <fileset dir="launch4j" includes="*.exe" />
-- <fileset dir="launch4j" includes="*.ini" />
- </copy>
- <chmod file="${build}/freeplane.sh" perm="ugo+rx" />
- </target>
diff --git a/debian/patches/60_no_license_latex.patch b/debian/patches/60_no_license_latex.patch
deleted file mode 100644
index e3bfed8..0000000
--- a/debian/patches/60_no_license_latex.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-remove JLaTeXMath license, it's in separate libjlatexmath-java package
---- a/freeplane_plugin_latex/ant/build.xml
-+++ b/freeplane_plugin_latex/ant/build.xml
-@@ -45,7 +45,7 @@
- <mkdir dir="${dist.osgi.dir}" />
- <copy todir="${dist.osgi.dir}">
- <fileset dir="${root}">
-- <include name="lib/**"/>
-+ <include name="lib/**/*.jar"/>
- </fileset>
- </copy>
- <mkdir dir="${dist.osgi.dir}/META-INF" />
diff --git a/debian/patches/70_skip_bugreport.patch b/debian/patches/70_skip_bugreport.patch
deleted file mode 100644
index 236441d..0000000
--- a/debian/patches/70_skip_bugreport.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-disable automatic sending of bug reports
---- a/build.xml
-+++ b/build.xml
-@@ -5,7 +5,9 @@
- </target>
-
- <target name="dist">
-- <ant antfile="freeplane_framework/ant/build.xml" target="dist" inheritAll="false" />
-+ <ant antfile="freeplane_framework/ant/build.xml" target="dist" inheritAll="false">
-+ <property name="skip_bugreport" value="true" />
-+ </ant>
- </target>
- <target name="format-translation">
- <ant antfile="JOrtho_0.4_freeplane/build.xml" target="format-translation" inheritAll="false" />
diff --git a/debian/patches/80_no_update_check.patch b/debian/patches/80_no_update_check.patch
deleted file mode 100644
index 794c22c..0000000
--- a/debian/patches/80_no_update_check.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-disable update check in all menus as well as update check on startup (see #626187)
-TODO: in 1.3.x, the menus are stored in mindmaps => how to patch this?
---- a/freeplane/src/org/freeplane/main/application/FreeplaneGUIStarter.java
-+++ b/freeplane/src/org/freeplane/main/application/FreeplaneGUIStarter.java
-@@ -167,7 +167,7 @@
- LinkController.install();
- IconController.install();
- HelpController.install();
-- controller.addAction(new UpdateCheckAction());
-+ //controller.addAction(new UpdateCheckAction());
- controller.addAction(new NextNodeAction(Direction.FORWARD));
- controller.addAction(new NextNodeAction(Direction.BACK));
- controller.addAction(new NextNodeAction(Direction.FORWARD_N_FOLD));
---- a/freeplane/resources/xml/browsemodemenu.mm
-+++ b/freeplane/resources/xml/browsemodemenu.mm
-@@ -483,6 +483,7 @@
- <attribute NAME="type" VALUE="submenu"/>
- <attribute NAME="name" VALUE="help"/>
- <attribute NAME="name_ref" VALUE="help"/>
-+<!--
- <node TEXT="update" FOLDED="true" ID="ID_972374411" CREATED="1370343428377" MODIFIED="1370343428377">
- <attribute NAME="type" VALUE="category"/>
- <attribute NAME="name" VALUE="update"/>
-@@ -491,6 +492,7 @@
- <attribute NAME="action" VALUE="UpdateCheckAction"/>
- </node>
- </node>
-+-->
- <node TEXT="Web resources" FOLDED="true" ID="ID_902808063" CREATED="1370343428377" MODIFIED="1370343428377">
- <attribute NAME="type" VALUE="category"/>
- <attribute NAME="name" VALUE="Web resources"/>
---- a/freeplane/resources/xml/filemodemenu.mm
-+++ b/freeplane/resources/xml/filemodemenu.mm
-@@ -367,6 +367,7 @@
- <attribute NAME="type" VALUE="submenu"/>
- <attribute NAME="name" VALUE="help"/>
- <attribute NAME="name_ref" VALUE="help"/>
-+<!--
- <node TEXT="update" FOLDED="true" ID="ID_1178888256" CREATED="1370196341118" MODIFIED="1370196341118">
- <attribute NAME="type" VALUE="category"/>
- <attribute NAME="name" VALUE="update"/>
-@@ -375,6 +376,7 @@
- <attribute NAME="action" VALUE="UpdateCheckAction"/>
- </node>
- </node>
-+-->
- <node TEXT="Web resources" FOLDED="true" ID="ID_911592986" CREATED="1370196341125" MODIFIED="1370196341125">
- <attribute NAME="type" VALUE="category"/>
- <attribute NAME="name" VALUE="Web resources"/>
---- a/freeplane/resources/xml/mindmapmodemenu.mm
-+++ b/freeplane/resources/xml/mindmapmodemenu.mm
-@@ -1592,6 +1592,7 @@
- <attribute NAME="type" VALUE="submenu"/>
- <attribute NAME="name" VALUE="help"/>
- <attribute NAME="name_ref" VALUE="help"/>
-+<!--
- <node TEXT="update" FOLDED="true" ID="ID_722782407" CREATED="1370194798905" MODIFIED="1370194798905">
- <attribute NAME="type" VALUE="category"/>
- <attribute NAME="name" VALUE="update"/>
-@@ -1600,6 +1601,7 @@
- <attribute NAME="action" VALUE="UpdateCheckAction"/>
- </node>
- </node>
-+-->
- <node TEXT="---" ID="ID_1292710565" CREATED="1370194798906" MODIFIED="1370194798906">
- <attribute NAME="type" VALUE="separator"/>
- </node>
diff --git a/debian/patches/92_fix_old_manifest.patch b/debian/patches/92_fix_old_manifest.patch
deleted file mode 100644
index 3725bba..0000000
--- a/debian/patches/92_fix_old_manifest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-remove classpath from _old_ MANIFEST, this is now done using the OSGi MANIFEST
---- a/freeplane/META-INF/OLD_MANIFEST.MF
-+++ b/freeplane/META-INF/OLD_MANIFEST.MF
-@@ -1,11 +1,2 @@
- Manifest-Version: 1.0
- Main-Class: org.freeplane.main.application.FreeplaneMain
--Class-Path: ../
-- freeplaneeditor.jar
-- freeplaneviewer.jar
-- freeplanemac.jar
-- commons-lang-2.6.jar
-- forms-1.0.5.jar
-- jortho.jar
-- gnu-regexp-1.1.4.jar
-- SimplyHTML.jar
diff --git a/debian/patches/93_jgoodies1.6.patch b/debian/patches/93_jgoodies1.6.patch
deleted file mode 100644
index 4338ae4..0000000
--- a/debian/patches/93_jgoodies1.6.patch
+++ /dev/null
@@ -1,456 +0,0 @@
-fix code for libjgoodies-forms-java 1.3->1.6 transition
---- a/freeplane/src/org/freeplane/core/resources/components/OptionPanel.java
-+++ b/freeplane/src/org/freeplane/core/resources/components/OptionPanel.java
-@@ -50,7 +50,7 @@
- import org.freeplane.features.mode.Controller;
-
- import com.jgoodies.forms.builder.DefaultFormBuilder;
--import com.jgoodies.forms.factories.ButtonBarFactory;
-+import com.jgoodies.forms.builder.ButtonBarBuilder;
- import com.jgoodies.forms.layout.FormLayout;
-
- public class OptionPanel {
-@@ -99,6 +99,35 @@
- new OptionPanelBuilder();
- }
-
-+ /**
-+ * Builds and returns a right aligned button bar with the given buttons.
-+ *
-+ * @param buttons an array of buttons to add
-+ * @return a right aligned button bar with the given buttons
-+ */
-+ public static JPanel buildRightAlignedBar(JButton[] buttons) {
-+// ButtonBarBuilder2 builder = new ButtonBarBuilder2();
-+ ButtonBarBuilder builder = new ButtonBarBuilder();
-+ builder.addGlue();
-+ builder.addButton(buttons);
-+ return builder.getPanel();
-+ }
-+
-+
-+ /**
-+ * Builds and returns a button bar with OK and Cancel.
-+ *
-+ * @param ok the OK button
-+ * @param cancel the Cancel button
-+ * @return a panel that contains the button(s)
-+ */
-+ public static JPanel buildOKCancelBar(
-+ JButton ok, JButton cancel) {
-+ return buildRightAlignedBar(new JButton[] {ok, cancel});
-+ }
-+
-+
-+
- public void buildPanel(final DefaultMutableTreeNode controlsTree) {
- final FormLayout leftLayout = new FormLayout("max(80dlu;p):grow", "");
- final DefaultFormBuilder leftBuilder = new DefaultFormBuilder(leftLayout);
-@@ -157,7 +186,7 @@
- }
- });
- topDialog.getRootPane().setDefaultButton(okButton);
-- topDialog.getContentPane().add(ButtonBarFactory.buildOKCancelBar(cancelButton, okButton), BorderLayout.SOUTH);
-+ topDialog.getContentPane().add(buildOKCancelBar(cancelButton, okButton), BorderLayout.SOUTH);
- }
-
- private boolean validate() {
---- a/freeplane/src/org/freeplane/features/styles/mindmapmode/StyleEditorPanel.java
-+++ b/freeplane/src/org/freeplane/features/styles/mindmapmode/StyleEditorPanel.java
-@@ -761,7 +761,7 @@
- final String form = "right:max(20dlu;p), 2dlu, p, 1dlu,right:max(20dlu;p), 4dlu, 80dlu, 7dlu";
- final FormLayout rightLayout = new FormLayout(form, "");
- final DefaultFormBuilder rightBuilder = new DefaultFormBuilder(rightLayout);
-- rightBuilder.setBorder(Borders.DLU2_BORDER);
-+ rightBuilder.border(Borders.DLU2);
- rightBuilder.appendSeparator(TextUtils.getText("OptionPanel.separator.NodeStyle"));
- if (addStyleBox) {
- addAutomaticLayout(rightBuilder);
---- a/freeplane/src/org/freeplane/view/swing/features/time/mindmapmode/TimeManagement.java
-+++ b/freeplane/src/org/freeplane/view/swing/features/time/mindmapmode/TimeManagement.java
-@@ -78,7 +78,7 @@
- import org.freeplane.features.text.mindmapmode.MTextController;
-
- import com.jgoodies.forms.builder.DefaultFormBuilder;
--import com.jgoodies.forms.factories.FormFactory;
-+import com.jgoodies.forms.layout.FormSpecs;
- import com.jgoodies.forms.layout.FormLayout;
-
- /**
-@@ -157,11 +157,11 @@
- calendarContainer.setAlignmentX(0.5f);
- add(calendarContainer);
-
-- DefaultFormBuilder btnBuilder = new DefaultFormBuilder(new FormLayout(FormFactory.GROWING_BUTTON_COLSPEC.toString(), ""));
-+ DefaultFormBuilder btnBuilder = new DefaultFormBuilder(new FormLayout(FormSpecs.GROWING_BUTTON_COLSPEC.toString(), ""));
- btnBuilder.getLayout().addGroupedColumn(btnBuilder.getColumnCount());
- for(int i = 1; i< colCount; i++){
- btnBuilder.appendRelatedComponentsGapColumn();
-- btnBuilder.appendColumn(FormFactory.GROWING_BUTTON_COLSPEC);
-+ btnBuilder.appendColumn(FormSpecs.GROWING_BUTTON_COLSPEC);
- btnBuilder.getLayout().addGroupedColumn(btnBuilder.getColumnCount());
- }
-
---- a/freeplane_plugin_script/src/org/freeplane/plugin/script/addons/AddOnDetailsPanel.java
-+++ b/freeplane_plugin_script/src/org/freeplane/plugin/script/addons/AddOnDetailsPanel.java
-@@ -28,7 +28,7 @@
- import org.freeplane.plugin.script.ExecuteScriptAction;
- import org.freeplane.plugin.script.addons.ScriptAddOnProperties.Script;
-
--import com.jgoodies.forms.factories.FormFactory;
-+import com.jgoodies.forms.layout.FormSpecs;
- import com.jgoodies.forms.layout.ColumnSpec;
- import com.jgoodies.forms.layout.FormLayout;
- import com.jgoodies.forms.layout.RowSpec;
-@@ -41,18 +41,18 @@
- public AddOnDetailsPanel(final AddOnProperties addOn, final String warning) {
- this.warning = warning;
- setLayout(new FormLayout(new ColumnSpec[] {
-- FormFactory.DEFAULT_COLSPEC,
-- FormFactory.RELATED_GAP_COLSPEC,
-+ FormSpecs.DEFAULT_COLSPEC,
-+ FormSpecs.RELATED_GAP_COLSPEC,
- ColumnSpec.decode("default:grow"),},
- new RowSpec[] {
-- FormFactory.RELATED_GAP_ROWSPEC,
-- FormFactory.DEFAULT_ROWSPEC,
-- FormFactory.RELATED_GAP_ROWSPEC,
-- FormFactory.DEFAULT_ROWSPEC,
-- FormFactory.RELATED_GAP_ROWSPEC,
-- FormFactory.DEFAULT_ROWSPEC,
-- FormFactory.RELATED_GAP_ROWSPEC,
-- FormFactory.DEFAULT_ROWSPEC,
-+ FormSpecs.RELATED_GAP_ROWSPEC,
-+ FormSpecs.DEFAULT_ROWSPEC,
-+ FormSpecs.RELATED_GAP_ROWSPEC,
-+ FormSpecs.DEFAULT_ROWSPEC,
-+ FormSpecs.RELATED_GAP_ROWSPEC,
-+ FormSpecs.DEFAULT_ROWSPEC,
-+ FormSpecs.RELATED_GAP_ROWSPEC,
-+ FormSpecs.DEFAULT_ROWSPEC,
- RowSpec.decode("top:default:grow"),}));
- if (warning != null) {
- JLabel warningLabel = createWarningLabel(addOn);
---- a/freeplane_plugin_script/src/org/freeplane/plugin/script/addons/AddOnInstallerPanel.java
-+++ b/freeplane_plugin_script/src/org/freeplane/plugin/script/addons/AddOnInstallerPanel.java
-@@ -43,7 +43,7 @@
- import org.freeplane.plugin.script.ScriptingPermissions;
-
- import com.jgoodies.forms.factories.DefaultComponentFactory;
--import com.jgoodies.forms.factories.FormFactory;
-+import com.jgoodies.forms.layout.FormSpecs;
- import com.jgoodies.forms.layout.ColumnSpec;
- import com.jgoodies.forms.layout.FormLayout;
- import com.jgoodies.forms.layout.RowSpec;
-@@ -62,17 +62,17 @@
- setLayout(new FormLayout(new ColumnSpec[] {
- ColumnSpec.decode("default:grow"),},
- new RowSpec[] {
-- FormFactory.RELATED_GAP_ROWSPEC,
-- FormFactory.DEFAULT_ROWSPEC,
-- FormFactory.RELATED_GAP_ROWSPEC,
-- FormFactory.DEFAULT_ROWSPEC,
-- FormFactory.RELATED_GAP_ROWSPEC,
-- FormFactory.DEFAULT_ROWSPEC,
-- FormFactory.DEFAULT_ROWSPEC,
-- FormFactory.RELATED_GAP_ROWSPEC,
-- FormFactory.DEFAULT_ROWSPEC,
-- FormFactory.RELATED_GAP_ROWSPEC,
-- FormFactory.DEFAULT_ROWSPEC,}));
-+ FormSpecs.RELATED_GAP_ROWSPEC,
-+ FormSpecs.DEFAULT_ROWSPEC,
-+ FormSpecs.RELATED_GAP_ROWSPEC,
-+ FormSpecs.DEFAULT_ROWSPEC,
-+ FormSpecs.RELATED_GAP_ROWSPEC,
-+ FormSpecs.DEFAULT_ROWSPEC,
-+ FormSpecs.DEFAULT_ROWSPEC,
-+ FormSpecs.RELATED_GAP_ROWSPEC,
-+ FormSpecs.DEFAULT_ROWSPEC,
-+ FormSpecs.RELATED_GAP_ROWSPEC,
-+ FormSpecs.DEFAULT_ROWSPEC,}));
- //
- // Search
- //
---- a/freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/components/dialog/FileExistsDialogPanel.java
-+++ b/freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/components/dialog/FileExistsDialogPanel.java
-@@ -10,7 +10,7 @@
-
- import org.freeplane.core.util.TextUtils;
-
--import com.jgoodies.forms.factories.FormFactory;
-+import com.jgoodies.forms.layout.FormSpecs;
- import com.jgoodies.forms.layout.ColumnSpec;
- import com.jgoodies.forms.layout.FormLayout;
- import com.jgoodies.forms.layout.RowSpec;
-@@ -26,13 +26,13 @@
- }
-
- setLayout(new FormLayout(new ColumnSpec[] {
-- FormFactory.RELATED_GAP_COLSPEC,
-+ FormSpecs.RELATED_GAP_COLSPEC,
- ColumnSpec.decode("default:grow"),},
- new RowSpec[] {
-- FormFactory.RELATED_GAP_ROWSPEC,
-+ FormSpecs.RELATED_GAP_ROWSPEC,
- RowSpec.decode("fill:default:grow"),
-- FormFactory.RELATED_GAP_ROWSPEC,
-- FormFactory.DEFAULT_ROWSPEC,}));
-+ FormSpecs.RELATED_GAP_ROWSPEC,
-+ FormSpecs.DEFAULT_ROWSPEC,}));
-
- JLabel lblNewLabel = new JLabel(TextUtils.format(message, targetFile.getName(), targetFile.getParent()));
- lblNewLabel.setVerticalAlignment(SwingConstants.TOP);
---- a/freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/components/dialog/ImportProjectDialogPanel.java
-+++ b/freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/components/dialog/ImportProjectDialogPanel.java
-@@ -41,7 +41,7 @@
- import org.freeplane.plugin.workspace.model.project.ProjectLoader;
- import org.freeplane.plugin.workspace.nodes.ProjectRootNode;
-
--import com.jgoodies.forms.factories.FormFactory;
-+import com.jgoodies.forms.layout.FormSpecs;
- import com.jgoodies.forms.layout.ColumnSpec;
- import com.jgoodies.forms.layout.FormLayout;
- import com.jgoodies.forms.layout.RowSpec;
-@@ -66,33 +66,33 @@
- public ImportProjectDialogPanel() {
- setPreferredSize(new Dimension(400, 180));
- setLayout(new FormLayout(new ColumnSpec[] {
-- FormFactory.RELATED_GAP_COLSPEC,
-- FormFactory.DEFAULT_COLSPEC,
-- FormFactory.RELATED_GAP_COLSPEC,
-+ FormSpecs.RELATED_GAP_COLSPEC,
-+ FormSpecs.DEFAULT_COLSPEC,
-+ FormSpecs.RELATED_GAP_COLSPEC,
- ColumnSpec.decode("max(100dlu;min):grow"),
-- FormFactory.RELATED_GAP_COLSPEC,
-- FormFactory.DEFAULT_COLSPEC,
-- FormFactory.RELATED_GAP_COLSPEC,
-- FormFactory.RELATED_GAP_COLSPEC,},
-+ FormSpecs.RELATED_GAP_COLSPEC,
-+ FormSpecs.DEFAULT_COLSPEC,
-+ FormSpecs.RELATED_GAP_COLSPEC,
-+ FormSpecs.RELATED_GAP_COLSPEC,},
- new RowSpec[] {
-- FormFactory.RELATED_GAP_ROWSPEC,
-+ FormSpecs.RELATED_GAP_ROWSPEC,
- RowSpec.decode("fill:max(50dlu;pref)"),
-- FormFactory.RELATED_GAP_ROWSPEC,
-- FormFactory.DEFAULT_ROWSPEC,
-- FormFactory.RELATED_GAP_ROWSPEC,
-+ FormSpecs.RELATED_GAP_ROWSPEC,
-+ FormSpecs.DEFAULT_ROWSPEC,
-+ FormSpecs.RELATED_GAP_ROWSPEC,
- RowSpec.decode("fill:default"),
-- FormFactory.RELATED_GAP_ROWSPEC,
-- FormFactory.DEFAULT_ROWSPEC,}));
-+ FormSpecs.RELATED_GAP_ROWSPEC,
-+ FormSpecs.DEFAULT_ROWSPEC,}));
-
- JPanel panel = new JPanel();
- panel.setBorder(new MatteBorder(0, 0, 1, 0, (Color) new Color(0, 0, 0)));
- panel.setBackground(Color.WHITE);
- add(panel, "1, 1, 8, 2, fill, fill");
- panel.setLayout(new FormLayout(new ColumnSpec[] {
-- FormFactory.RELATED_GAP_COLSPEC,
-+ FormSpecs.RELATED_GAP_COLSPEC,
- ColumnSpec.decode("default:grow"),},
- new RowSpec[] {
-- FormFactory.RELATED_GAP_ROWSPEC,
-+ FormSpecs.RELATED_GAP_ROWSPEC,
- RowSpec.decode("fill:default:grow"),}));
-
- JLabel lblNewLabel = new JLabel(TextUtils.getText(ImportProjectDialogPanel.class.getSimpleName().toLowerCase(Locale.ENGLISH)+".help"));
---- a/freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/components/dialog/NewDirectoryDialogPanel.java
-+++ b/freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/components/dialog/NewDirectoryDialogPanel.java
-@@ -11,7 +11,7 @@
- import javax.swing.JTextField;
- import com.jgoodies.forms.layout.FormLayout;
- import com.jgoodies.forms.layout.ColumnSpec;
--import com.jgoodies.forms.factories.FormFactory;
-+import com.jgoodies.forms.layout.FormSpecs;
- import com.jgoodies.forms.layout.RowSpec;
-
- /**
-@@ -30,18 +30,18 @@
- public NewDirectoryDialogPanel(String parentPath) {
- setMinimumSize(new Dimension(240,120));
- setLayout(new FormLayout(new ColumnSpec[] {
-- FormFactory.DEFAULT_COLSPEC,
-- FormFactory.RELATED_GAP_COLSPEC,
-+ FormSpecs.DEFAULT_COLSPEC,
-+ FormSpecs.RELATED_GAP_COLSPEC,
- ColumnSpec.decode("36px"),
-- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
-+ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
- ColumnSpec.decode("86px:grow"),
-- FormFactory.RELATED_GAP_COLSPEC,
-- FormFactory.DEFAULT_COLSPEC,},
-+ FormSpecs.RELATED_GAP_COLSPEC,
-+ FormSpecs.DEFAULT_COLSPEC,},
- new RowSpec[] {
-- FormFactory.LINE_GAP_ROWSPEC,
-+ FormSpecs.LINE_GAP_ROWSPEC,
- RowSpec.decode("20px"),
-- FormFactory.RELATED_GAP_ROWSPEC,
-- FormFactory.DEFAULT_ROWSPEC,}));
-+ FormSpecs.RELATED_GAP_ROWSPEC,
-+ FormSpecs.DEFAULT_ROWSPEC,}));
-
- JLabel lblIn = new JLabel("In:");
- add(lblIn, "3, 2, right, center");
---- a/freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/components/dialog/NewProjectDialogPanel.java
-+++ b/freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/components/dialog/NewProjectDialogPanel.java
-@@ -29,7 +29,7 @@
- import org.freeplane.plugin.workspace.WorkspaceController;
- import org.freeplane.plugin.workspace.model.project.AWorkspaceProject;
-
--import com.jgoodies.forms.factories.FormFactory;
-+import com.jgoodies.forms.layout.FormSpecs;
- import com.jgoodies.forms.layout.ColumnSpec;
- import com.jgoodies.forms.layout.FormLayout;
- import com.jgoodies.forms.layout.RowSpec;
-@@ -46,22 +46,22 @@
- public NewProjectDialogPanel() {
- setPreferredSize(new Dimension(400, 160));
- setLayout(new FormLayout(new ColumnSpec[] {
-- FormFactory.RELATED_GAP_COLSPEC,
-- FormFactory.DEFAULT_COLSPEC,
-- FormFactory.RELATED_GAP_COLSPEC,
-+ FormSpecs.RELATED_GAP_COLSPEC,
-+ FormSpecs.DEFAULT_COLSPEC,
-+ FormSpecs.RELATED_GAP_COLSPEC,
- ColumnSpec.decode("max(100dlu;min):grow"),
-- FormFactory.RELATED_GAP_COLSPEC,
-- FormFactory.DEFAULT_COLSPEC,
-- FormFactory.RELATED_GAP_COLSPEC,
-- FormFactory.RELATED_GAP_COLSPEC,},
-+ FormSpecs.RELATED_GAP_COLSPEC,
-+ FormSpecs.DEFAULT_COLSPEC,
-+ FormSpecs.RELATED_GAP_COLSPEC,
-+ FormSpecs.RELATED_GAP_COLSPEC,},
- new RowSpec[] {
-- FormFactory.RELATED_GAP_ROWSPEC,
-+ FormSpecs.RELATED_GAP_ROWSPEC,
- RowSpec.decode("fill:max(30dlu;pref)"),
-- FormFactory.RELATED_GAP_ROWSPEC,
-- FormFactory.DEFAULT_ROWSPEC,
-- FormFactory.RELATED_GAP_ROWSPEC,
-+ FormSpecs.RELATED_GAP_ROWSPEC,
-+ FormSpecs.DEFAULT_ROWSPEC,
-+ FormSpecs.RELATED_GAP_ROWSPEC,
- RowSpec.decode("fill:default"),
-- FormFactory.RELATED_GAP_ROWSPEC,
-+ FormSpecs.RELATED_GAP_ROWSPEC,
- RowSpec.decode("fill:default"),}));
-
- JPanel panel = new JPanel();
-@@ -69,10 +69,10 @@
- panel.setBackground(Color.WHITE);
- add(panel, "1, 1, 8, 2, fill, fill");
- panel.setLayout(new FormLayout(new ColumnSpec[] {
-- FormFactory.RELATED_GAP_COLSPEC,
-+ FormSpecs.RELATED_GAP_COLSPEC,
- ColumnSpec.decode("default:grow"),},
- new RowSpec[] {
-- FormFactory.RELATED_GAP_ROWSPEC,
-+ FormSpecs.RELATED_GAP_ROWSPEC,
- RowSpec.decode("fill:default:grow"),}));
-
- JLabel lblNewLabel = new JLabel(TextUtils.getText(NewProjectDialogPanel.class.getSimpleName().toLowerCase(Locale.ENGLISH)+".help"));
---- a/freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/components/dialog/NodeRenameDialogPanel.java
-+++ b/freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/components/dialog/NodeRenameDialogPanel.java
-@@ -10,7 +10,7 @@
- import javax.swing.JPanel;
- import javax.swing.JTextField;
-
--import com.jgoodies.forms.factories.FormFactory;
-+import com.jgoodies.forms.layout.FormSpecs;
- import com.jgoodies.forms.layout.ColumnSpec;
- import com.jgoodies.forms.layout.FormLayout;
- import com.jgoodies.forms.layout.RowSpec;
-@@ -35,18 +35,18 @@
- public NodeRenameDialogPanel(String oldName, boolean isMutableNode) {
- setMinimumSize(new Dimension(240,120));
- setLayout(new FormLayout(new ColumnSpec[] {
-- FormFactory.DEFAULT_COLSPEC,
-- FormFactory.RELATED_GAP_COLSPEC,
-+ FormSpecs.DEFAULT_COLSPEC,
-+ FormSpecs.RELATED_GAP_COLSPEC,
- ColumnSpec.decode("36px"),
-- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
-+ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
- ColumnSpec.decode("86px:grow"),
-- FormFactory.RELATED_GAP_COLSPEC,
-- FormFactory.DEFAULT_COLSPEC,},
-+ FormSpecs.RELATED_GAP_COLSPEC,
-+ FormSpecs.DEFAULT_COLSPEC,},
- new RowSpec[] {
-- FormFactory.RELATED_GAP_ROWSPEC,
-- FormFactory.DEFAULT_ROWSPEC,
-- FormFactory.RELATED_GAP_ROWSPEC,
-- FormFactory.DEFAULT_ROWSPEC,}));
-+ FormSpecs.RELATED_GAP_ROWSPEC,
-+ FormSpecs.DEFAULT_ROWSPEC,
-+ FormSpecs.RELATED_GAP_ROWSPEC,
-+ FormSpecs.DEFAULT_ROWSPEC,}));
-
- JLabel lblName = new JLabel("name:");
- add(lblName, "3, 2, right, default");
---- a/freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/components/dialog/WorkspaceNewFolderPanel.java
-+++ b/freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/components/dialog/WorkspaceNewFolderPanel.java
-@@ -25,7 +25,7 @@
- import org.freeplane.plugin.workspace.WorkspaceController;
- import org.freeplane.plugin.workspace.model.AWorkspaceTreeNode;
-
--import com.jgoodies.forms.factories.FormFactory;
-+import com.jgoodies.forms.layout.FormSpecs;
- import com.jgoodies.forms.layout.ColumnSpec;
- import com.jgoodies.forms.layout.FormLayout;
- import com.jgoodies.forms.layout.RowSpec;
-@@ -60,27 +60,27 @@
- setMinimumSize(new Dimension(320, 160));
- setPreferredSize(new Dimension(320, 160));
- setLayout(new FormLayout(new ColumnSpec[] {
-- FormFactory.RELATED_GAP_COLSPEC,
-- FormFactory.DEFAULT_COLSPEC,
-- FormFactory.RELATED_GAP_COLSPEC,
-- FormFactory.DEFAULT_COLSPEC,
-- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
-+ FormSpecs.RELATED_GAP_COLSPEC,
-+ FormSpecs.DEFAULT_COLSPEC,
-+ FormSpecs.RELATED_GAP_COLSPEC,
-+ FormSpecs.DEFAULT_COLSPEC,
-+ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
- ColumnSpec.decode("default:grow"),
-- FormFactory.RELATED_GAP_COLSPEC,
-- FormFactory.DEFAULT_COLSPEC,
-- FormFactory.RELATED_GAP_COLSPEC,},
-+ FormSpecs.RELATED_GAP_COLSPEC,
-+ FormSpecs.DEFAULT_COLSPEC,
-+ FormSpecs.RELATED_GAP_COLSPEC,},
- new RowSpec[] {
-- FormFactory.RELATED_GAP_ROWSPEC,
-- FormFactory.DEFAULT_ROWSPEC,
-- FormFactory.RELATED_GAP_ROWSPEC,
-- FormFactory.DEFAULT_ROWSPEC,
-- FormFactory.RELATED_GAP_ROWSPEC,
-- FormFactory.DEFAULT_ROWSPEC,
-- FormFactory.RELATED_GAP_ROWSPEC,
-- FormFactory.DEFAULT_ROWSPEC,
-- FormFactory.RELATED_GAP_ROWSPEC,
-- FormFactory.RELATED_GAP_ROWSPEC,
-- FormFactory.DEFAULT_ROWSPEC,}));
-+ FormSpecs.RELATED_GAP_ROWSPEC,
-+ FormSpecs.DEFAULT_ROWSPEC,
-+ FormSpecs.RELATED_GAP_ROWSPEC,
-+ FormSpecs.DEFAULT_ROWSPEC,
-+ FormSpecs.RELATED_GAP_ROWSPEC,
-+ FormSpecs.DEFAULT_ROWSPEC,
-+ FormSpecs.RELATED_GAP_ROWSPEC,
-+ FormSpecs.DEFAULT_ROWSPEC,
-+ FormSpecs.RELATED_GAP_ROWSPEC,
-+ FormSpecs.RELATED_GAP_ROWSPEC,
-+ FormSpecs.DEFAULT_ROWSPEC,}));
-
- JLabel lblPath = new JLabel(TextUtils.getText("workspace.action.node.new.folder.dialog.parent.label"));
- lblPath.setHorizontalAlignment(SwingConstants.RIGHT);
diff --git a/debian/patches/95_run_jflex.patch b/debian/patches/95_run_jflex.patch
deleted file mode 100644
index b2ddb5a..0000000
--- a/debian/patches/95_run_jflex.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-add a target that runs jflex on latex.flex to generate LaTeXLexer.java
-+ a clean step for LaTeXLexer.java
---- a/freeplane_plugin_script/ant/build.xml
-+++ b/freeplane_plugin_script/ant/build.xml
-@@ -18,7 +18,15 @@
- <property name="classpath" value="${framework.jar}:${freeplane.jars}:${external.jars}:${jsyntaxpane.jar}" />
- <property name="apidocdir" value="dist/doc/api" />
-
-- <target name="build" depends="build-ui-xml">
-+ <target name="build-latex-lexer">
-+ <exec executable="jflex">
-+ <arg value="-d"/>
-+ <arg value="src-jsyntaxpane/jsyntaxpane/lexers/"/>
-+ <arg value="src-jsyntaxpane/jsyntaxpane/lexers/latex.flex"/>
-+ </exec>
-+ </target>
-+
-+ <target name="build" depends="build-ui-xml,build-latex-lexer">
- <mkdir dir="build" />
- <javac srcdir="src" destdir="build" classpath="${classpath}" debug="${debug}" source="${java_source_version}" target="${java_target_version}" encoding="utf8">
- <exclude name="**/*Test.*" />
-@@ -111,6 +119,7 @@
- </delete>
- <delete file="lib/jsyntaxpane/nodehighlighter.jar" quiet="true"/>
- <delete file="${src.pluginclass}/preferences.xml" quiet="true"/>
-+ <delete file="src-jsyntaxpane/jsyntaxpane/lexers/LaTeXLexer.java"/>
- </target>
-
- </project>
diff --git a/debian/patches/97_jmapviewer1.11.patch b/debian/patches/97_jmapviewer1.11.patch
deleted file mode 100644
index 4664296..0000000
--- a/debian/patches/97_jmapviewer1.11.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-Description: Fixes for incompatibilities in JMapViewer 1.11
-Author: Felix Natter
-Applied-Upstream: https://github.com/freeplane/freeplane/commit/808193bce07cc99bc65fc647f369d780d1cb7049
-Reviewed-by: <name and email of a reviewer, optional>
-Last-Update: 2015-10-15
---- a/freeplane_plugin_openmaps/src/org/freeplane/plugin/openmaps/LocationChoosenListener.java
-+++ b/freeplane_plugin_openmaps/src/org/freeplane/plugin/openmaps/LocationChoosenListener.java
-@@ -1,10 +1,11 @@
- package org.freeplane.plugin.openmaps;
-
- import org.openstreetmap.gui.jmapviewer.Coordinate;
-+import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
-
- /**
- * @author Blair Archibald
- */
- public interface LocationChoosenListener {
-- public void locationChoosenAction(Coordinate locationChoosen, int zoom);
-+ public void locationChoosenAction(ICoordinate locationChoosen, int zoom);
- }
---- a/freeplane_plugin_openmaps/src/org/freeplane/plugin/openmaps/OpenMapsExtension.java
-+++ b/freeplane_plugin_openmaps/src/org/freeplane/plugin/openmaps/OpenMapsExtension.java
-@@ -2,6 +2,7 @@
-
- import org.freeplane.core.extension.IExtension;
- import org.openstreetmap.gui.jmapviewer.Coordinate;
-+import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
-
- /**
- * @author Blair Archibald
-@@ -33,7 +34,7 @@
- location = new Coordinate(location_x, location_y);
- }
-
-- public void updateLocation(Coordinate locationChoosen) {
-+ public void updateLocation(ICoordinate locationChoosen) {
- location = new Coordinate(locationChoosen.getLat(), locationChoosen.getLon());
- }
-
---- a/freeplane_plugin_openmaps/src/org/freeplane/plugin/openmaps/OpenMapsNodeHook.java
-+++ b/freeplane_plugin_openmaps/src/org/freeplane/plugin/openmaps/OpenMapsNodeHook.java
-@@ -15,6 +15,7 @@
- import org.freeplane.plugin.openmaps.mapelements.OpenMapsDialog;
- import org.openstreetmap.gui.jmapviewer.Coordinate;
- import org.freeplane.plugin.openmaps.LocationChoosenListener;
-+import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
-
- /**
- * @author Blair Archibald
-@@ -49,7 +50,7 @@
-
-
- //Called when a location is chosen in the OpenMapsDialog - Only one location may be chosen at a time
-- public void locationChoosenAction(Coordinate locationChoosen, int zoom) {
-+ public void locationChoosenAction(ICoordinate locationChoosen, int zoom) {
- addChoosenLocationToSelectedNode(locationChoosen, zoom);
- map.getController().removeLocationChoosenListener(this);
- }
-@@ -101,7 +102,7 @@
- }
- }
-
-- private void addChoosenLocationToSelectedNode(Coordinate locationChoosen, int zoom) {
-+ private void addChoosenLocationToSelectedNode(ICoordinate locationChoosen, int zoom) {
- final NodeModel node = getCurrentlySelectedNode();
- OpenMapsExtension openMapsExtension = (OpenMapsExtension) node.getExtension(OpenMapsExtension.class);
-
-@@ -113,7 +114,7 @@
- refreshNode(node);
- }
-
-- private void setLocationChoiceUndoable(final OpenMapsExtension extension, final Coordinate locationChoosen, final int zoomChoosen) {
-+ private void setLocationChoiceUndoable(final OpenMapsExtension extension, final ICoordinate locationChoosen, final int zoomChoosen) {
- final Coordinate currentLocation = extension.getLocation();
- final int currentZoom = extension.getZoom();
-
-@@ -127,11 +128,11 @@
- }
- }
-
-- private IActor createUndoActor(final OpenMapsExtension extension, final Coordinate newlyChoosenLocation,
-- final Coordinate currentlyStoredLocation, final int newlyChoosenZoom , final int currentlyStoredZoom) {
-+ private IActor createUndoActor(final OpenMapsExtension extension, final ICoordinate newlyChoosenLocation,
-+ final ICoordinate currentlyStoredLocation, final int newlyChoosenZoom , final int currentlyStoredZoom) {
-
- return new IActor() {
-- private final Coordinate oldLocation = currentlyStoredLocation;
-+ private final ICoordinate oldLocation = currentlyStoredLocation;
- private final int oldZoom = currentlyStoredZoom;
-
- public void act() {
---- a/freeplane_plugin_openmaps/src/org/freeplane/plugin/openmaps/mapelements/OpenMapsController.java
-+++ b/freeplane_plugin_openmaps/src/org/freeplane/plugin/openmaps/mapelements/OpenMapsController.java
-@@ -12,6 +12,7 @@
- import org.openstreetmap.gui.jmapviewer.JMapViewer;
- import org.openstreetmap.gui.jmapviewer.MapMarkerDot;
- import org.openstreetmap.gui.jmapviewer.OsmMercator;
-+import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
-
- /**
- * @author Blair Archibald
-@@ -37,7 +38,7 @@
- @Override
- public void mouseClicked(MouseEvent e) {
- if (e.getClickCount() == 2 && e.getButton() == MouseEvent.BUTTON1) {
-- final Coordinate locationChoosen = getSelectedLocation(e.getPoint());
-+ final ICoordinate locationChoosen = getSelectedLocation(e.getPoint());
- if (locationCount < 1) {
- addMarkerToLocation(locationChoosen);
- locationCount++;
-@@ -54,13 +55,13 @@
- Listeners.remove(listener);
- }
-
-- private void sendLocation(Coordinate locationChoosen, int zoom) {
-+ private void sendLocation(ICoordinate locationChoosen, int zoom) {
- for (LocationChoosenListener l : Listeners) {
- l.locationChoosenAction(locationChoosen, zoom);
- }
- }
-
-- public Coordinate getSelectedLocation(Point clickedLocation) {
-+ public ICoordinate getSelectedLocation(Point clickedLocation) {
- return map.getPosition(clickedLocation);
- }
-
-@@ -68,7 +69,7 @@
- return map.getZoom();
- }
-
-- private void addMarkerToLocation(final Coordinate locationChoosen) {
-+ private void addMarkerToLocation(final ICoordinate locationChoosen) {
- map.addMapMarker(new MapMarkerDot(locationChoosen.getLat(), locationChoosen.getLon()));
- }
-
-@@ -77,12 +78,11 @@
- addMarkerToLocation(location);
- locationCount++;
- }
-+
-+ final OsmMercator osmMercator = new OsmMercator();
-
-- // this method is not available in JMapViewer >= 1.03!
--// map.setDisplayPositionByLatLon(new Point(map.getWidth() / 2, map.getHeight() / 2), location.getLat(), location.getLon(), zoom);
--
-- int x = (int)OsmMercator.LonToX(location.getLon(), zoom);
-- int y = (int)OsmMercator.LatToY(location.getLat(), zoom);
-+ int x = (int)osmMercator.lonToX(location.getLon(), zoom);
-+ int y = (int)osmMercator.latToY(location.getLat(), zoom);
- map.setDisplayPosition(new Point(map.getWidth() / 2, map.getHeight() / 2), x, y, zoom);
- }
-
diff --git a/debian/patches/98_groovy2.4fix.patch b/debian/patches/98_groovy2.4fix.patch
deleted file mode 100644
index 9489a4a..0000000
--- a/debian/patches/98_groovy2.4fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix operator ambiguity in addon install script
-Author: Gergely Papp <gergely.papp at itworks.hu>
-Applied-Upstream: https://github.com/freeplane/freeplane/commit/1762d5b8a90cf900ed954d4444087e50efa06c07
-Reviewed-by: Felix Natter <fnatter at gmx.net>
-Last-Update: 2016-05-19
---- a/freeplane_plugin_script/scripts/installScriptAddOn.groovy
-+++ b/freeplane_plugin_script/scripts/installScriptAddOn.groovy
-@@ -502,7 +502,7 @@
-
- boolean confirmInstall(ScriptAddOnProperties addOn, ScriptAddOnProperties installedAddOn) {
- def screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-- def dialogPrefSize = new Dimension((int) screenSize.getWidth() * 3 / 5, (int) screenSize.getHeight() * 1 / 2);
-+ def dialogPrefSize = new Dimension((int) (screenSize.getWidth() * 3 / 5), (int) (screenSize.getHeight() * 1 / 2));
- def warning = textUtils.removeTranslateComment(textUtils.getText('addons.installer.warning'))
- def addOnDetailsPanel = new AddOnDetailsPanel(addOn, warning)
- addOnDetailsPanel.maxWidth = 500
diff --git a/debian/patches/series b/debian/patches/series
index 5557fed..d177a01 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,14 +1,4 @@
-10_libraries_properties.patch
-15_libraries_manifest.patch
+10_build_usr_share_java.patch
20_freeplane_sh.patch
-21_freeplane_sh_fix_spaces.patch
-40_no_winmac.patch
-50_no_copy_files.patch
-60_no_license_latex.patch
-70_skip_bugreport.patch
-80_no_update_check.patch
-92_fix_old_manifest.patch
-93_jgoodies1.6.patch
-95_run_jflex.patch
-97_jmapviewer1.11.patch
-98_groovy2.4fix.patch
+30_disable_update_check.patch
+40_allow_usj_codebase.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/freeplane.git
More information about the pkg-java-commits
mailing list