The following commit has been merged in the master branch:
commit 4c43afdb3f1365e9329a5e59a1a2bb0a3997215d
Author: Felix Natter <[email protected]>
Date: Fri Mar 22 20:10:18 2013 +0100
fix patches for 1.2.22
diff --git a/debian/patches/20_freeplane_sh.patch
b/debian/patches/20_freeplane_sh.patch
index 301ce78..9086ac2 100644
--- a/debian/patches/20_freeplane_sh.patch
+++ b/debian/patches/20_freeplane_sh.patch
@@ -1,6 +1,6 @@
--- a/freeplane_framework/script/freeplane.sh
+++ b/freeplane_framework/script/freeplane.sh
-@@ -6,6 +6,13 @@
+@@ -5,6 +5,13 @@
set -x
fi
@@ -14,34 +14,29 @@
########## FUNCTIONS DEFINITIONS #######################################
_debug() {
-@@ -31,44 +38,44 @@
+@@ -29,36 +36,36 @@
findjava() {
# We try hard to find the proper 'java' command
-- if [ -n "${JAVACMD}" ] && [ -x "${JAVACMD}" ]
-+ if [ -n "${JAVA_CMD}" ] && [ -x "${JAVA_CMD}" ]
- then
+- if [ -n "${JAVACMD}" ] && [ -x "${JAVACMD}" ]; then
- _debug "Using \$JAVACMD to find java virtual machine."
++ if [ -n "${JAVA_CMD}" ] && [ -x "${JAVA_CMD}" ]; then
+ _debug "Using \$JAVA_CMD to find java virtual machine."
- elif [ -n "${JAVA_BINDIR}" ] && [ -x "${JAVA_BINDIR}/java" ]
- then
+ elif [ -n "${JAVA_BINDIR}" ] && [ -x "${JAVA_BINDIR}/java" ]; then
- JAVACMD="${JAVA_BINDIR}/java"
+ JAVA_CMD="${JAVA_BINDIR}/java"
_debug "Using \$JAVA_BINDIR to find java virtual machine."
- elif [ -n "${JAVA_HOME}" ] && [ -x "${JAVA_HOME}/bin/java" ]
- then
+ elif [ -n "${JAVA_HOME}" ] && [ -x "${JAVA_HOME}/bin/java" ]; then
- JAVACMD="${JAVA_HOME}/bin/java"
+ JAVA_CMD="${JAVA_HOME}/bin/java"
_debug "Using \$JAVA_HOME to find java virtual machine."
else
- JAVACMD=$(which java)
-- if [ -n "${JAVACMD}" ] && [ -x "${JAVACMD}" ]
+- if [ -n "${JAVACMD}" ] && [ -x "${JAVACMD}" ]; then
+ JAVA_CMD=$(which java)
-+ if [ -n "${JAVA_CMD}" ] && [ -x "${JAVA_CMD}" ]
- then
++ if [ -n "${JAVA_CMD}" ] && [ -x "${JAVA_CMD}" ]; then
_debug "Using \$PATH to find java virtual machine."
- elif [ -x /usr/bin/java ]
- then
+ elif [ -x /usr/bin/java ]; then
_debug "Using /usr/bin/java to find java virtual
machine."
- JAVACMD=/usr/bin/java
+ JAVA_CMD=/usr/bin/java
@@ -49,19 +44,16 @@
fi
# if we were successful, we return 0 else we complain and return 1
-- if [ -n "${JAVACMD}" ] && [ -x "${JAVACMD}" ]
-+ if [ -n "${JAVA_CMD}" ] && [ -x "${JAVA_CMD}" ]
- then
+- if [ -n "${JAVACMD}" ] && [ -x "${JAVACMD}" ]; then
- _debug "Using '$JAVACMD' as java virtual machine..."
++ if [ -n "${JAVA_CMD}" ] && [ -x "${JAVA_CMD}" ]; then
+ _debug "Using '$JAVA_CMD' as java virtual machine..."
- if [ -n "${DEBUG}" ]
- then
+ if [ -n "${DEBUG}" ]; then
- "$JAVACMD" -version >&2
+ "$JAVA_CMD" -version >&2
fi
-- if (! "${JAVACMD}" -version 2>&1 | grep -qe 'Java(TM)' -e
OpenJDK)
-+ if (! "${JAVA_CMD}" -version 2>&1 | grep -qe 'Java(TM)' -e
OpenJDK)
- then
+- if (! "${JAVACMD}" -version 2>&1 | grep -qe 'Java(TM)' -e
OpenJDK); then
++ if (! "${JAVA_CMD}" -version 2>&1 | grep -qe 'Java(TM)' -e
OpenJDK); then
_error "Your Java is not a derivative from Sun's code,"
\
"========================================" \
"FREEPLANE WILL MOST PROBABLY *NOT* WORK," \
@@ -71,7 +63,7 @@
"in order to point to such a VM." \
"See the manpage of freeplane(1) for details."
JAVA_TYPE=other
-@@ -78,7 +85,7 @@
+@@ -68,7 +75,7 @@
return 0
else
_error "Couldn't find a java virtual machine," \
@@ -80,13 +72,12 @@
return 1
fi
}
-@@ -125,10 +132,16 @@
+@@ -110,9 +117,16 @@
_source /etc/freeplane/freeplanerc
_source "${userfpdir}/freeplanerc"
-findjava
--if [ $? -ne 0 ]
--then
+-if [ $? -ne 0 ]; then
- exit 1
+if [ -r /usr/lib/java-wrappers/java-wrappers.sh ]
+then # the Debian method
@@ -101,19 +92,19 @@
fi
output_debug_info
-@@ -189,7 +202,7 @@
- defines=-Dgnu.java.awt.peer.gtk.Graphics=Graphics2D
+@@ -158,7 +172,7 @@
fi
+
_debug "Calling: "\
-"${JAVACMD}" -Xmx512m\
+"${JAVA_CMD}" -Xmx512m\
"-Dorg.freeplane.param1=$1"\
"-Dorg.freeplane.param2=$2"\
"-Dorg.freeplane.param3=$3"\
-@@ -207,7 +220,7 @@
- -xargs "${freedir}/props.xargs"\
- -xargs "${freedir}/init.xargs"
+@@ -178,7 +192,7 @@
( echo "${DEBUG}" | grep -qe "exit" ) && exit 0 # do not start Freeplane
+
+ # now actually launch Freeplane
-"${JAVACMD}" -Xmx512m\
+"${JAVA_CMD}" -Xmx512m\
"-Dorg.freeplane.param1=$1"\
diff --git a/debian/patches/40_no_winmac.patch
b/debian/patches/40_no_winmac.patch
index 512df72..33ffd91 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
-@@ -444,7 +444,7 @@
- </exec>
+@@ -467,7 +467,7 @@
+ </checksum>
</target>
-- <target name="dist" depends="git_version_info, binzip, srczip,
installer, portableinstaller, zip4mac, dmg4mac, javadoc">
-+ <target name="dist" depends="git_version_info, binzip, srczip">
+- <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"
--
freeplane packaging
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
