[pkg-java] r13362 - in trunk/freeplane/debian: . patches
Eric Lavarde
ewl-guest at alioth.debian.org
Sat Feb 26 15:47:50 UTC 2011
Author: ewl-guest
Date: 2011-02-26 15:47:49 +0000 (Sat, 26 Feb 2011)
New Revision: 13362
Added:
trunk/freeplane/debian/freeplane.bug-script
trunk/freeplane/debian/patches/20_freeplane_sh.patch
Modified:
trunk/freeplane/debian/changelog
trunk/freeplane/debian/control
trunk/freeplane/debian/patches/40_no_winmac.patch
trunk/freeplane/debian/patches/series
trunk/freeplane/debian/rules
Log:
New upstream release.
uscan call in get-orig-source target with rename and repack.
Bumped standard to 3.9.1.0 (no actual changes).
Use java-wrappers to detect best available Java version.
Removed alternative dependency on Sun Java 5.
Add reportbug hook to gather more information.
Modified: trunk/freeplane/debian/changelog
===================================================================
--- trunk/freeplane/debian/changelog 2011-02-26 13:46:24 UTC (rev 13361)
+++ trunk/freeplane/debian/changelog 2011-02-26 15:47:49 UTC (rev 13362)
@@ -1,3 +1,14 @@
+freeplane (1.1.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * uscan call in get-orig-source target with rename and repack.
+ * Bumped standard to 3.9.1.0 (no actual changes).
+ * Use java-wrappers to detect best available Java version.
+ * Removed alternative dependency on Sun Java 5.
+ * Add reportbug hook to gather more information.
+
+ -- Eric Lavarde <deb at zorglub.s.bawue.de> Sat, 26 Feb 2011 16:13:12 +0100
+
freeplane (1.1.1-1) unstable; urgency=low
* Initial release (Closes: #566375).
Modified: trunk/freeplane/debian/control
===================================================================
--- trunk/freeplane/debian/control 2011-02-26 13:46:24 UTC (rev 13361)
+++ trunk/freeplane/debian/control 2011-02-26 15:47:49 UTC (rev 13362)
@@ -3,15 +3,15 @@
Priority: extra
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Eric Lavarde <deb at zorglub.s.bawue.de>
-Build-Depends: cdbs, debhelper (>= 7), docbook-to-man, imagemagick, ant, openjdk-6-jdk
+Build-Depends: cdbs, debhelper (>= 7), docbook-to-man, imagemagick, ant, openjdk-6-jdk, quilt
Build-Depends-Indep: javahelp2, groovy, libcommons-lang-java, libjgoodies-forms-java, simplyhtml, libbatik-java, rhino, fop, libxerces2-java, libxml-commons-external-java, libjaxp1.3-java, libjlatexmath-java, libknopflerfish-osgi-framework-java
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1.0
Homepage: http://freeplane.org/
Package: freeplane
Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | sun-java5-jre | sun-java6-jre, javahelp2, groovy, libcommons-lang-java, libjgoodies-forms-java, simplyhtml, libbatik-java, rhino, fop, libxerces2-java, libxml-commons-external-java, libjaxp1.3-java, libjlatexmath-java, libknopflerfish-osgi-framework-java, libjortho-freeplane-java (= ${binary:Version})
-Recommends: xdg-utils
+Depends: ${misc:Depends}, openjdk-6-jre | sun-java6-jre, javahelp2, groovy, libcommons-lang-java, libjgoodies-forms-java, simplyhtml, libbatik-java, rhino, fop, libxerces2-java, libxml-commons-external-java, libjaxp1.3-java, libjlatexmath-java, libknopflerfish-osgi-framework-java, libjortho-freeplane-java (= ${binary:Version})
+Recommends: xdg-utils, java-wrappers
Description: A Java program to create and edit mind maps.
Freeplane is a free, open source software application for creating mind maps
(diagrams of connections between ideas), and electronic outlines.
@@ -28,7 +28,7 @@
Package: libjortho-freeplane-java
Section: java
Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | sun-java5-jre | sun-java6-jre
+Depends: ${misc:Depends}, openjdk-6-jre | sun-java6-jre
Provides: libjortho-java
Description: A Java spell-checking library.
JOrtho (Java Orthography) is a spell-checker entirely written in Java.
Added: trunk/freeplane/debian/freeplane.bug-script
===================================================================
--- trunk/freeplane/debian/freeplane.bug-script (rev 0)
+++ trunk/freeplane/debian/freeplane.bug-script 2011-02-26 15:47:49 UTC (rev 13362)
@@ -0,0 +1,2 @@
+#!/bin/sh
+DEBUG=exit freeplane 1>&3 2>&3
Property changes on: trunk/freeplane/debian/freeplane.bug-script
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/freeplane/debian/patches/20_freeplane_sh.patch
===================================================================
--- trunk/freeplane/debian/patches/20_freeplane_sh.patch (rev 0)
+++ trunk/freeplane/debian/patches/20_freeplane_sh.patch 2011-02-26 15:47:49 UTC (rev 13362)
@@ -0,0 +1,121 @@
+--- a/freeplane_framework/script/freeplane.sh
++++ b/freeplane_framework/script/freeplane.sh
+@@ -6,6 +6,13 @@
+ set -x
+ fi
+
++# debug also java-wrapper
++if [ -n "${DEBUG}" ]
++then
++ DEBUG_WRAPPER=1
++ export DEBUG_WRAPPER
++fi
++
+ ########## FUNCTIONS DEFINITIONS #######################################
+
+ _debug() {
+@@ -31,44 +38,44 @@
+
+ findjava() {
+ # We try hard to find the proper 'java' command
+- if [ -n "${JAVACMD}" ] && [ -x "${JAVACMD}" ]
++ if [ -n "${JAVA_CMD}" ] && [ -x "${JAVA_CMD}" ]
+ then
+- _debug "Using \$JAVACMD to find java virtual machine."
++ _debug "Using \$JAVA_CMD to find java virtual machine."
+ 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
+- 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}" ]
++ JAVA_CMD=$(which java)
++ if [ -n "${JAVA_CMD}" ] && [ -x "${JAVA_CMD}" ]
+ then
+ _debug "Using \$PATH to find java virtual machine."
+ 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
+ fi
+ 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
+- _debug "Using '$JAVACMD' as java virtual machine..."
++ _debug "Using '$JAVA_CMD' as java virtual machine..."
+ 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
+ _error "Your Java is not a derivative from Sun's code," \
+ "=======================================" \
+ "FREEMIND 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." \
+ "See the manpage of freeplane(1) for details."
+ JAVA_TYPE=other
+@@ -78,7 +85,7 @@
+ return 0
+ else
+ _error "Couldn't find a java virtual machine," \
+- "define JAVACMD, JAVA_BINDIR, JAVA_HOME or PATH."
++ "define JAVA_CMD, JAVA_BINDIR, JAVA_HOME or PATH."
+ return 1
+ fi
+ }
+@@ -125,10 +132,16 @@
+ _source /etc/freeplane/freeplanerc
+ _source "${userfpdir}/freeplanerc"
+
+-findjava
+-if [ $? -ne 0 ]
+-then
+- exit 1
++if [ -r /usr/lib/java-wrappers/java-wrappers.sh ]
++then # the Debian method
++ . /usr/lib/java-wrappers/java-wrappers.sh
++ require_java_runtime java6
++else
++ findjava
++ if [ $? -ne 0 ]
++ then
++ exit 1
++ fi
+ fi
+
+ output_debug_info
+@@ -181,7 +194,7 @@
+ defines=-Dgnu.java.awt.peer.gtk.Graphics=Graphics2D
+ fi
+ _debug "Calling: "\
+-"${JAVACMD}" -Xmx512m\
++"${JAVA_CMD}" -Xmx512m\
+ "-Dorg.freeplane.param1=$1"\
+ "-Dorg.freeplane.param2=$2"\
+ "-Dorg.freeplane.param3=$3"\
+@@ -194,7 +207,7 @@
+ -xargs "${freedir}/props.xargs"\
+ -xargs "${freedir}/init.xargs"
+ ( echo "${DEBUG}" | grep -qe "exit" ) && exit 0 # do not start Freeplane
+-"${JAVACMD}" -Xmx512m\
++"${JAVA_CMD}" -Xmx512m\
+ "-Dorg.freeplane.param1=$1"\
+ "-Dorg.freeplane.param2=$2"\
+ "-Dorg.freeplane.param3=$3"\
Modified: trunk/freeplane/debian/patches/40_no_winmac.patch
===================================================================
--- trunk/freeplane/debian/patches/40_no_winmac.patch 2011-02-26 13:46:24 UTC (rev 13361)
+++ trunk/freeplane/debian/patches/40_no_winmac.patch 2011-02-26 15:47:49 UTC (rev 13362)
@@ -1,6 +1,6 @@
--- a/freeplane_framework/ant/build.xml
+++ b/freeplane_framework/ant/build.xml
-@@ -364,7 +364,7 @@
+@@ -367,7 +367,7 @@
</exec>
</target>
Modified: trunk/freeplane/debian/patches/series
===================================================================
--- trunk/freeplane/debian/patches/series 2011-02-26 13:46:24 UTC (rev 13361)
+++ trunk/freeplane/debian/patches/series 2011-02-26 15:47:49 UTC (rev 13362)
@@ -1,5 +1,6 @@
10_libraries_properties.patch
15_libraries_manifest.patch
+20_freeplane_sh.patch
40_no_winmac.patch
50_no_copy_files.patch
60_no_license_latex.patch
Modified: trunk/freeplane/debian/rules
===================================================================
--- trunk/freeplane/debian/rules 2011-02-26 13:46:24 UTC (rev 13361)
+++ trunk/freeplane/debian/rules 2011-02-26 15:47:49 UTC (rev 13362)
@@ -28,4 +28,4 @@
# Get original sources directly using uscan
get-orig-source:
- uscan --force-download
+ uscan --force-download --rename --repack
More information about the pkg-java-commits
mailing list