The following commit has been merged in the master branch: commit 691e2854fb4fbfd39d930c6d0f6bd66c3d1ca015 Author: Felix Natter <fnat...@gmx.net> Date: Fri Mar 22 21:33:18 2013 +0100
add patch descriptions diff --git a/debian/patches/10_libraries_properties.patch b/debian/patches/10_libraries_properties.patch index 0f9864b..e6eb59c 100644 --- a/debian/patches/10_libraries_properties.patch +++ b/debian/patches/10_libraries_properties.patch @@ -1,3 +1,4 @@ +changes paths to dependency jars to /usr/share/java/... --- a/freeplane/ant/ant.properties +++ b/freeplane/ant/ant.properties @@ -1,12 +1,14 @@ diff --git a/debian/patches/15_libraries_manifest.patch b/debian/patches/15_libraries_manifest.patch index 613a156..82ad4e5 100644 --- a/debian/patches/15_libraries_manifest.patch +++ b/debian/patches/15_libraries_manifest.patch @@ -1,3 +1,4 @@ +adapts jar paths in core MANIFEST as well as plugin MANIFESTs --- a/freeplane/META-INF/MANIFEST.MF +++ b/freeplane/META-INF/MANIFEST.MF @@ -7,12 +7,12 @@ diff --git a/debian/patches/20_freeplane_sh.patch b/debian/patches/20_freeplane_sh.patch index 9086ac2..0c308be 100644 --- a/debian/patches/20_freeplane_sh.patch +++ b/debian/patches/20_freeplane_sh.patch @@ -1,3 +1,4 @@ +JAVACMD->JAVA_CMD, use java-wrappers.sh instead of findjava if available, maybe more --- a/freeplane_framework/script/freeplane.sh +++ b/freeplane_framework/script/freeplane.sh @@ -5,6 +5,13 @@ diff --git a/debian/patches/40_no_winmac.patch b/debian/patches/40_no_winmac.patch index 33ffd91..52f3b52 100644 --- a/debian/patches/40_no_winmac.patch +++ b/debian/patches/40_no_winmac.patch @@ -1,3 +1,4 @@ +don't build windows/mac installers --- a/freeplane_framework/ant/build.xml +++ b/freeplane_framework/ant/build.xml @@ -467,7 +467,7 @@ diff --git a/debian/patches/50_no_copy_files.patch b/debian/patches/50_no_copy_files.patch index c6237da..8d66163 100644 --- a/debian/patches/50_no_copy_files.patch +++ b/debian/patches/50_no_copy_files.patch @@ -1,3 +1,4 @@ +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 @@ -131,14 +131,14 @@ diff --git a/debian/patches/60_no_license_latex.patch b/debian/patches/60_no_license_latex.patch index 79e4de7..2d17d71 100644 --- a/debian/patches/60_no_license_latex.patch +++ b/debian/patches/60_no_license_latex.patch @@ -1,3 +1,4 @@ +remove JLaTeXMath license, it's in separate libjlatexmath-java package --- a/freeplane_plugin_latex/ant/build.xml +++ b/freeplane_plugin_latex/ant/build.xml @@ -33,7 +33,7 @@ diff --git a/debian/patches/70_skip_bugreport.patch b/debian/patches/70_skip_bugreport.patch index 2bfc9b3..bebbbe5 100644 --- a/debian/patches/70_skip_bugreport.patch +++ b/debian/patches/70_skip_bugreport.patch @@ -1,3 +1,4 @@ +disable automatic sending of bug reports --- a/build.xml +++ b/build.xml @@ -7,7 +7,9 @@ diff --git a/debian/patches/80_no_update_check.patch b/debian/patches/80_no_update_check.patch index fc83bf3..aa7f401 100644 --- a/debian/patches/80_no_update_check.patch +++ b/debian/patches/80_no_update_check.patch @@ -1,4 +1,4 @@ -disable update check in all menus +disable update check in all menus as well as update check on startup --- a/freeplane/src/org/freeplane/main/application/FreeplaneStarter.java +++ b/freeplane/src/org/freeplane/main/application/FreeplaneStarter.java @@ -158,7 +158,7 @@ diff --git a/debian/patches/90_fix_jsyntaxpane_location.patch b/debian/patches/90_fix_jsyntaxpane_location.patch index d2216a7..2a69c34 100644 --- a/debian/patches/90_fix_jsyntaxpane_location.patch +++ b/debian/patches/90_fix_jsyntaxpane_location.patch @@ -1,3 +1,4 @@ +JSyntaxPaneProxy is only needed for J5, we hardcode the path to the JSyntaxPane jar to /usr/share/java/jsyntaxpane.jar --- 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 @@ diff --git a/debian/patches/92_fix_old_manifest.patch b/debian/patches/92_fix_old_manifest.patch index 1b62c80..511a849 100644 --- a/debian/patches/92_fix_old_manifest.patch +++ b/debian/patches/92_fix_old_manifest.patch @@ -1,4 +1,4 @@ -remove classpath, IMHO this is done using OSGi +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 @@ -- freeplane packaging _______________________________________________ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits