[SCM] freeplane packaging branch, master, updated. debian/1.1.3-2-52-g4b68a3f

Felix Natter fnatter at gmx.net
Sat Apr 6 15:27:24 UTC 2013


The following commit has been merged in the master branch:
commit d056ed22ccfeaff5e6775c9091d5f5930aebaa04
Author: Felix Natter <fnatter at gmx.net>
Date:   Sat Jan 19 18:56:31 2013 +0100

    Fix jsyntaxpane.jar location

diff --git a/debian/patches/90_fix_jsyntaxpane_location.patch b/debian/patches/90_fix_jsyntaxpane_location.patch
new file mode 100644
index 0000000..d2216a7
--- /dev/null
+++ b/debian/patches/90_fix_jsyntaxpane_location.patch
@@ -0,0 +1,18 @@
+--- a/freeplane_plugin_script/src/org/freeplane/plugin/script/JSyntaxPaneProxy.java
++++ b/freeplane_plugin_script/src/org/freeplane/plugin/script/JSyntaxPaneProxy.java
+@@ -49,12 +49,15 @@
+ 		URL nodehighlighterJar;
+ 		try {
+ 			final URL pluginUrl = context.getBundle().getEntry("/");
++      /*
+ 			if (Compat.isLowerJdk(Compat.VERSION_1_6_0)) {
+ 				jsyntaxpaneJar = new URL(pluginUrl, "lib/jsyntaxpane/jsyntaxpane-jdk5.jar");
+ 			}
+ 			else {
+ 				jsyntaxpaneJar = new URL(pluginUrl, "lib/jsyntaxpane/jsyntaxpane.jar");
+ 			}
++      */
++      jsyntaxpaneJar = new URL("file:///usr/share/java/jsyntaxpane.jar");
+ 			nodehighlighterJar = new URL(pluginUrl, "lib/jsyntaxpane/nodehighlighter.jar");
+ 		}
+ 		catch (MalformedURLException e1) {
diff --git a/debian/patches/series b/debian/patches/series
index 1470e32..b7b089d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 60_no_license_latex.patch
 70_skip_bugreport.patch
 80_no_update_check.patch
+90_fix_jsyntaxpane_location.patch

-- 
freeplane packaging



More information about the pkg-java-commits mailing list