[SCM] freeplane packaging branch, master, updated. debian/1.1.3-2-52-g4b68a3f
Felix Natter
fnatter at gmx.net
Sat Apr 6 15:27:23 UTC 2013
The following commit has been merged in the master branch:
commit cae414db99eba919bec4a4f4a1210593b0881168
Author: Felix Natter <fnatter at gmx.net>
Date: Sat Jan 19 13:25:05 2013 +0100
Update patches from 1.1.3 to 1.2.20
diff --git a/debian/patches/10_libraries_properties.patch b/debian/patches/10_libraries_properties.patch
index 850b6d2..0f9864b 100644
--- a/debian/patches/10_libraries_properties.patch
+++ b/debian/patches/10_libraries_properties.patch
@@ -1,6 +1,6 @@
--- a/freeplane/ant/ant.properties
+++ b/freeplane/ant/ant.properties
-@@ -1,11 +1,11 @@
+@@ -1,12 +1,14 @@
-freeplane.ext.lib = ${workspace}/freeplane/lib
+freeplane.ext.lib = /usr/share/java
freeplane.dist.lib = ${workspace}/freeplane/dist/lib
@@ -10,15 +10,21 @@
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.0.jar
--forms.jar = ${freeplane.ext.lib}/forms-1.0.5.jar
+-commons-io.jar = ${freeplane.ext.lib}/commons-io-2.4.jar
+-forms.jar = ${freeplane.ext.lib}/forms-1.2.1.jar
++# currently commons-lang-2.6.jar
+commons-lang.jar = ${freeplane.ext.lib}/commons-lang.jar
++# TODO: upstream freeplane requires commons-io-2.4.jar, but debian only has 1.4 ?
++commons-io.jar = ${freeplane.ext.lib}/commons-io.jar
+forms.jar = ${freeplane.ext.lib}/forms.jar
SimplyHTML.jar = ${freeplane.ext.lib}/SimplyHTML.jar
-jortho.jar = ${freeplane.ext.lib}/jortho.jar
+jortho.jar = ${workspace}/JOrtho_0.4_freeplane/dist/lib/jortho-0.4+fp1.1.1.jar
--- a/freeplane_framework/ant/ant.properties
+++ b/freeplane_framework/ant/ant.properties
-@@ -1,2 +1,2 @@
+@@ -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
@@ -37,15 +43,18 @@
+++ b/freeplane_plugin_latex/ant/ant.properties
@@ -1,2 +1,2 @@
-plugin.ext.lib = lib
+-jlatexmath.jar = ${plugin.ext.lib}/jlatexmath-0.9.7.jar
+plugin.ext.lib = /usr/share/java
- jlatexmath.jar = ${plugin.ext.lib}/jlatexmath.jar
++jlatexmath.jar = ${plugin.ext.lib}/jlatexmath.jar
--- a/freeplane_plugin_script/ant/ant.properties
+++ b/freeplane_plugin_script/ant/ant.properties
-@@ -1,2 +1,2 @@
+@@ -1,3 +1,4 @@
-plugin.ext.lib = lib
--groovy.jar = ${plugin.ext.lib}/groovy-all-1.5.6.jar
+plugin.ext.lib = /usr/share/java
-+groovy.jar = ${plugin.ext.lib}/groovy-all.jar
+ groovy.jar = ${plugin.ext.lib}/groovy-all.jar
+-jsyntaxpane.jar = ${plugin.ext.lib}/jsyntaxpane/jsyntaxpane-jdk5.jar
++#jsyntaxpane.jar = ${plugin.ext.lib}/jsyntaxpane/jsyntaxpane-jdk5.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 @@
diff --git a/debian/patches/15_libraries_manifest.patch b/debian/patches/15_libraries_manifest.patch
index 8c12c18..613a156 100644
--- a/debian/patches/15_libraries_manifest.patch
+++ b/debian/patches/15_libraries_manifest.patch
@@ -1,22 +1,24 @@
--- a/freeplane/META-INF/MANIFEST.MF
+++ b/freeplane/META-INF/MANIFEST.MF
-@@ -7,11 +7,11 @@
+@@ -7,12 +7,12 @@
lib/freeplaneeditor.jar,
lib/freeplanemac.jar,
lib/freeplaneosgi.jar,
- lib/commons-lang-2.0.jar,
-- lib/forms-1.0.5.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/jortho.jar,
+ ../../../java/commons-lang.jar,
++ ../../../commons-io.jar,
+ ../../../java/forms.jar,
+ ../../../java/gnu-regexp-1.1.4.jar,
+ ../../../java/SimplyHTML.jar,
-+ ../../../java/jortho.jar
++ ../../../java/jortho.jar,
+ lib/imgscalr-lib-3.2.jar
Bundle-Activator: org.freeplane.main.osgi.Activator
- Import-Package: org.osgi.framework
- Export-Package: org.apache.commons.lang,
+ Import-Package: org.osgi.framework,
--- a/freeplane_plugin_help/META-INF/MANIFEST.MF
+++ b/freeplane_plugin_help/META-INF/MANIFEST.MF
@@ -8,5 +8,5 @@
@@ -28,22 +30,22 @@
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
-@@ -7,5 +7,5 @@
- Import-Package: org.osgi.framework;version="1.3.0"
+@@ -9,4 +9,4 @@
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.freeplane.core;bundle-version="1.0.1"
--Bundle-ClassPath: lib/jlatexmath.jar,
-+Bundle-ClassPath: ../../../java/jlatexmath.jar,
- lib/plugin.jar
+ Bundle-ClassPath: lib/plugin.jar,
+- lib/jlatexmath-0.9.7.jar
++ ../../../java/jlatexmath.jar
--- a/freeplane_plugin_script/META-INF/MANIFEST.MF
+++ b/freeplane_plugin_script/META-INF/MANIFEST.MF
-@@ -7,5 +7,5 @@
+@@ -7,6 +7,6 @@
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/groovy-all-1.5.6.jar,
+-Bundle-ClassPath: lib/groovy-all.jar,
+Bundle-ClassPath: ../../../java/groovy-all.jar,
lib/plugin.jar
+ Export-Package: org.freeplane.plugin.script
--- a/freeplane_plugin_svg/META-INF/MANIFEST.MF
+++ b/freeplane_plugin_svg/META-INF/MANIFEST.MF
@@ -7,27 +7,14 @@
diff --git a/debian/patches/20_freeplane_sh.patch b/debian/patches/20_freeplane_sh.patch
index c8f73f9..301ce78 100644
--- a/debian/patches/20_freeplane_sh.patch
+++ b/debian/patches/20_freeplane_sh.patch
@@ -63,9 +63,9 @@
+ if (! "${JAVA_CMD}" -version 2>&1 | grep -qe 'Java(TM)' -e OpenJDK)
then
_error "Your Java is not a derivative from Sun's code," \
- "=======================================" \
- "FREEMIND WILL MOST PROBABLY *NOT* WORK," \
- "=======================================" \
+ "========================================" \
+ "FREEPLANE WILL MOST PROBABLY *NOT* WORK," \
+ "========================================" \
- "define JAVACMD, JAVA_BINDIR, JAVA_HOME or PATH" \
+ "define JAVA_CMD, JAVA_BINDIR, JAVA_HOME or PATH" \
"in order to point to such a VM." \
@@ -101,7 +101,7 @@
fi
output_debug_info
-@@ -181,7 +194,7 @@
+@@ -189,7 +202,7 @@
defines=-Dgnu.java.awt.peer.gtk.Graphics=Graphics2D
fi
_debug "Calling: "\
@@ -110,7 +110,7 @@
"-Dorg.freeplane.param1=$1"\
"-Dorg.freeplane.param2=$2"\
"-Dorg.freeplane.param3=$3"\
-@@ -194,7 +207,7 @@
+@@ -207,7 +220,7 @@
-xargs "${freedir}/props.xargs"\
-xargs "${freedir}/init.xargs"
( echo "${DEBUG}" | grep -qe "exit" ) && exit 0 # do not start Freeplane
diff --git a/debian/patches/40_no_winmac.patch b/debian/patches/40_no_winmac.patch
index 2e5f615..512df72 100644
--- a/debian/patches/40_no_winmac.patch
+++ b/debian/patches/40_no_winmac.patch
@@ -1,11 +1,11 @@
--- a/freeplane_framework/ant/build.xml
+++ b/freeplane_framework/ant/build.xml
-@@ -367,7 +367,7 @@
+@@ -444,7 +444,7 @@
</exec>
</target>
-- <target name="dist" depends="bzr_version_info, binzip, srczip, installer, portableinstaller, zip4mac, dmg4mac">
-+ <target name="dist" depends="bzr_version_info, binzip, srczip">
+- <target name="dist" depends="git_version_info, binzip, srczip, installer, portableinstaller, zip4mac, dmg4mac, javadoc">
++ <target name="dist" depends="git_version_info, binzip, srczip">
<copy file="${workspace}/freeplane/doc/history_en.txt"
todir="${dist}" />
- <copy file="${build}/bzrinfo.txt"
+ <copy file="${build}/gitinfo.txt"
diff --git a/debian/patches/50_no_copy_files.patch b/debian/patches/50_no_copy_files.patch
index 1749a9b..c6237da 100644
--- a/debian/patches/50_no_copy_files.patch
+++ b/debian/patches/50_no_copy_files.patch
@@ -1,6 +1,6 @@
--- a/freeplane/ant/build.xml
+++ b/freeplane/ant/build.xml
-@@ -116,14 +116,14 @@
+@@ -131,14 +131,14 @@
</jar>
</target>
@@ -20,13 +20,14 @@
<fileset dir="external-resources"/>
--- a/freeplane_framework/ant/build.xml
+++ b/freeplane_framework/ant/build.xml
-@@ -48,9 +48,6 @@
- <mkdir dir="${build}" />
+@@ -142,10 +142,6 @@
<copy todir="${build}">
<fileset dir="${script}" />
-- <fileset file="${framework.jar}" />
-- <fileset file="windows-launcher/freeplane.exe" />
-- <fileset file="windows-launcher/freeplaneConsole.exe" />
+ <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" />
- <antcall target="makePlugin" inheritall="false">
+ </target>
diff --git a/debian/patches/70_skip_bugreport.patch b/debian/patches/70_skip_bugreport.patch
index 04fa6d0..2bfc9b3 100644
--- a/debian/patches/70_skip_bugreport.patch
+++ b/debian/patches/70_skip_bugreport.patch
@@ -9,5 +9,5 @@
+ <property name="skip_bugreport" value="true" />
+ </ant>
</target>
-
- <target name="clean">
+ <target name="format-translation">
+ <ant antfile="JOrtho_0.4_freeplane/build.xml" target="format-translation"
diff --git a/debian/patches/80_no_update_check.patch b/debian/patches/80_no_update_check.patch
index bb5bf30..1beb395 100644
--- a/debian/patches/80_no_update_check.patch
+++ b/debian/patches/80_no_update_check.patch
@@ -1,11 +1,11 @@
--- a/freeplane/src/org/freeplane/main/application/FreeplaneStarter.java
+++ b/freeplane/src/org/freeplane/main/application/FreeplaneStarter.java
-@@ -123,7 +123,7 @@
- LinkController.install(controller);
- IconController.install(controller);
- HelpController.install(controller);
-- controller.addAction(new UpdateCheckAction(controller));
-+ // controller.addAction(new UpdateCheckAction(controller));
- controller.addAction(new NextNodeAction(controller, Direction.FORWARD));
- controller.addAction(new NextNodeAction(controller, Direction.BACK));
- controller.addAction(new NextNodeAction(controller, Direction.FORWARD_N_FOLD));
+@@ -158,7 +158,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));
--
freeplane packaging
More information about the pkg-java-commits
mailing list