Author: ewl-guest
Date: 2010-05-08 19:20:44 +0000 (Sat, 08 May 2010)
New Revision: 12368
Added:
trunk/freemind/debian/clean-sources.sh
trunk/freemind/debian/patches/05_freemind_sh_wrapper.patch
Removed:
trunk/freemind/debian/export-freemind-cvs.sh
Modified:
trunk/freemind/debian/changelog
trunk/freemind/debian/control
trunk/freemind/debian/patches/02_build_xml_jibx.patch
trunk/freemind/debian/patches/03_freemind_sh.patch
trunk/freemind/debian/patches/series
trunk/freemind/debian/rules
trunk/freemind/debian/watch
Log:
* New upstream version.
* Recommend and use (if present) java-wrappers + remove java2-runtime
and Java5 dependencies (Closes: #573875).
* Use directly uscan to download and repackage upstream sources.
* Bump policy version from 3.8.3 to 3.8.4 (no changes)
* Switch to source format 3.0 (thanks to Torsten Werner).
And, sorry Torsten, but roll-back of JiBx 1.2 changes to keep compatibility
with Ubuntu.
Modified: trunk/freemind/debian/changelog
===================================================================
--- trunk/freemind/debian/changelog 2010-05-08 19:16:03 UTC (rev 12367)
+++ trunk/freemind/debian/changelog 2010-05-08 19:20:44 UTC (rev 12368)
@@ -1,10 +1,13 @@
-freemind (0.9.0~rc6+dfsg-4) unstable; urgency=low
+freemind (0.9.0~rc7+dfsg-1) unstable; urgency=low
- UNRELEASED
- * Switch to source format 3.0.
- * Switch to libjibx1.2-java.
+ * New upstream version.
+ * Recommend and use (if present) java-wrappers + remove java2-runtime
+ and Java5 dependencies (Closes: #573875).
+ * Use directly uscan to download and repackage upstream sources.
+ * Bump policy version from 3.8.3 to 3.8.4 (no changes)
+ * Switch to source format 3.0 (thanks to Torsten Werner).
- -- Torsten Werner <twer...@debian.org> Sat, 08 May 2010 17:32:37 +0200
+ -- Eric Lavarde <d...@zorglub.s.bawue.de> Sat, 08 May 2010 15:32:28 +0200
freemind (0.9.0~rc6+dfsg-3) unstable; urgency=low
Copied: trunk/freemind/debian/clean-sources.sh (from rev 11853,
trunk/freemind/debian/export-freemind-cvs.sh)
===================================================================
--- trunk/freemind/debian/clean-sources.sh (rev 0)
+++ trunk/freemind/debian/clean-sources.sh 2010-05-08 19:20:44 UTC (rev
12368)
@@ -0,0 +1,39 @@
+#!/bin/sh -x
+
+PACKAGE="freemind"
+
+if [ $# -ne 3 ] || [ $1 != '--upstream-version' ]
+then
+ echo "Call: $0 --upstream-version <version> <file>" >&2
+ echo "Example: $0 --upstream-version 0.9.0~rc7
../freemind-src-0.9.0_RC_7.tar.gz" >&2
+ echo "See manpage USCAN(1) for more details" >&2
+ exit 2
+fi
+
+version="$2"
+file="$3"
+
+basedir=$(dirname "$file")
+packdir="${basedir}/${PACKAGE}-${version}"
+
+if [ -d ../tarballs ]
+then # structure of svn-buildpackage
+ origtar="../tarballs/${PACKAGE}_${version}+dfsg.orig.tar.gz"
+else
+ origtar="${basedir}/${PACKAGE}_${version}+dfsg.orig.tar.gz"
+fi
+
+if [ -d "${packdir}" ]
+then
+ rm -rI "${packdir}"
+fi
+
+mkdir "${packdir}"
+tar xzf "${file}" -C "${packdir}" || exit 1
+find "${packdir}" -name \*.zip -o -name \*.jar -o -name \*.class | xargs rm -vf
+rm -vfr ${packdir}/freemind/windows-launcher
+tar czf "${origtar}" -C "${basedir}" $(basename "${packdir}") || exit 1
+
+echo "Original source file saved to '${origtar}'."
+
+rm -rf "${packdir}"
Modified: trunk/freemind/debian/control
===================================================================
--- trunk/freemind/debian/control 2010-05-08 19:16:03 UTC (rev 12367)
+++ trunk/freemind/debian/control 2010-05-08 19:20:44 UTC (rev 12368)
@@ -5,15 +5,15 @@
Uploaders: Eric Lavarde <d...@zorglub.s.bawue.de>
# FreeMind can be built with JiBX 1.0, 1.1 and 1.2, but the result does only
# run with the version it was built with.
-Build-Depends-Indep: docbook-to-man, ant1.7 | ant (<< 1.8), ant1.7-optional |
ant-optional (<< 1.8), openjdk-6-jdk, imagemagick, libcommons-lang-java,
libbatik-java (>= 1.6), rhino, libjgoodies-forms-java, groovy, libjibx1.2-java
| libjibx-java (>= 1.1), libjibx1.2-java | libjibx-java (<< 1.3), simplyhtml
(>> 0.13), javahelp2, fop
+Build-Depends-Indep: docbook-to-man, ant1.7 | ant (<< 1.8), ant1.7-optional |
ant-optional (<< 1.8), openjdk-6-jdk, imagemagick, libcommons-lang-java,
libbatik-java (>= 1.6), rhino, libjgoodies-forms-java, groovy, libjibx1.1-java
| libjibx-java (>= 1.1), libjibx1.1-java | libjibx-java (<< 1.2), simplyhtml
(>> 0.13), javahelp2, fop
Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.8)
Homepage: http://freemind.sourceforge.net/
-Standards-Version: 3.8.3.0
+Standards-Version: 3.8.4.0
Package: freemind
Architecture: all
-Depends: openjdk-6-jre | sun-java5-jre | sun-java6-jre | java2-runtime,
libcommons-lang-java, libjgoodies-forms-java, libjibx1.2-java | libjibx-java
(>= 1.2), libjibx1.2-java | libjibx-java (<< 1.3), simplyhtml (>> 0.13),
${misc:Depends}
-Recommends: freemind-doc, xdg-utils
+Depends: openjdk-6-jre | sun-java6-jre, libcommons-lang-java,
libjgoodies-forms-java, libjibx1.1-java | libjibx-java (>= 1.1),
libjibx1.1-java | libjibx-java (<< 1.2), simplyhtml (>> 0.13), ${misc:Depends}
+Recommends: freemind-doc, xdg-utils, java-wrappers
Suggests: freemind-plugins-help, freemind-plugins-svg,
freemind-plugins-script, freemind-browser
Conflicts: freemind-plugins-time (<< ${binary:Version})
Replaces: freemind-plugins-time
@@ -50,7 +50,7 @@
Package: freemind-plugins-svg
Architecture: all
-Depends: openjdk-6-jre | sun-java5-jre | sun-java6-jre | java2-runtime,
freemind (= ${binary:Version}), libbatik-java (>= 1.6), rhino, ${misc:Depends}
+Depends: freemind (= ${binary:Version}), libbatik-java (>= 1.6), rhino,
${misc:Depends}
Recommends: fop
Description: Java Plugin for FreeMind to export Mindmaps to SVG and PDF
This plugin will add two menu points 'File -> Export -> SVG-Export' and
@@ -59,20 +59,20 @@
Package: freemind-plugins-help
Architecture: all
-Depends: openjdk-6-jre | sun-java5-jre | sun-java6-jre | java2-runtime,
freemind (= ${binary:Version}), ${misc:Depends}, javahelp2
+Depends: freemind (= ${binary:Version}), ${misc:Depends}, javahelp2
Description: Java Plugin for FreeMind to show an extended online help
This plugin will add a menu point 'Help -> Online Help'.
Package: freemind-plugins-script
Architecture: all
-Depends: openjdk-6-jre | sun-java5-jre | sun-java6-jre | java2-runtime,
freemind (= ${binary:Version}), groovy, ${misc:Depends}
+Depends: freemind (= ${binary:Version}), groovy, ${misc:Depends}
Description: Java Plugin for FreeMind to add scripting capabilities
This plugin will add the menu points 'Tools -> Evaluate' and
'Tools -> Script Editor...'.
#Package: freemind-plugins-collab-jabber
#Architecture: all
-#Depends: openjdk-6-jre | sun-java5-jre | sun-java6-jre | java2-runtime,
freemind (= ${binary:Version}), libcommons-logging-java, libcrimson-java,
liboro-java, libgnujaxp-java, libjdom0-java, liblog4j1.2-java, ${misc:Depends}
+#Depends: freemind (= ${binary:Version}), libcommons-logging-java,
libcrimson-java, liboro-java, libgnujaxp-java, libjdom0-java, liblog4j1.2-java,
${misc:Depends}
#Description: Java Plugin for FreeMind to collaborate over Jabber.
# This plugin will add a menu point 'Tools -> Start Collaboration Mode'.
# .
Deleted: trunk/freemind/debian/export-freemind-cvs.sh
===================================================================
--- trunk/freemind/debian/export-freemind-cvs.sh 2010-05-08 19:16:03 UTC
(rev 12367)
+++ trunk/freemind/debian/export-freemind-cvs.sh 2010-05-08 19:20:44 UTC
(rev 12368)
@@ -1,75 +0,0 @@
-#!/bin/bash -x
-# This small script can be used to export the FreeMind source tree from CVS
-# or get the sources from uscan and clean them up.
-if [ $# -lt 1 ]
-then
- echo "Usage: $0 <FreeMind version> [<RCS tag> [keep]]" >&2
- echo "Usage: $0 uscan [keep]" >&2
- echo "Example: $0 0.9.0~rc4 fm_0_9_0_rc4" >&2
- echo "Example: $0 0.9.0~rc6 uscan" >&2
- echo "Example: $0 0.8.0+01 FM-0-8-0 keep" >&2
- echo "Use the 'uscan' parameter to use uscan to download sources." >&2
- echo "Use the 'keep' parameter to keep a complete copy." >&2
- exit 1
-fi
-
-# if we are in a svn-buildpackage structure, we use it
-CURDIR="$(pwd)"
-DESTDIR="${CURDIR}"
-if [ -d "../tarballs" ]
-then
- DESTDIR="${CURDIR}/../tarballs"
-fi
-
-if [ $1 = "uscan" ]
-then
- if [ -f ${CURDIR}/debian/changelog ]
- then
- ver=$(uscan --destdir "${DESTDIR}" --repack --rename
--force-download --dehs | awk -F'[<>]' '$2 == "upstream-version" {print $3}')
- else
- echo "ERROR: uscan can't be called without changelog." >&2
- exit 1
- fi
-else
- ver=$1
-fi
-
-freemind_dir="freemind-$ver"
-freemind_orig_tar="freemind_${ver}.orig.tar.gz"
-freemind_dfsg_tar="freemind_${ver}+dfsg.orig.tar.gz"
-
-if [ $1 = "uscan" ] || [ $# -ge 2 ]
-then
- mkdir "${DESTDIR}/${freemind_dir}" || exit 1 # we don't want to
overwrite anything...
- cd "${DESTDIR}/${freemind_dir}" || exit 1
- if [ $1 = "uscan" ]
- then
- tar xzf "../${freemind_orig_tar}" || exit 1
- else
- cvs -z3
-d:pserver:anonym...@freemind.cvs.sourceforge.net:/cvsroot/freemind export -r
"$2" freemind || exit 1
- fi
-fi
-cd "${DESTDIR}"
-
-### SAVE FIRST THE WHOLE FREEMIND TREE ###
-if [ -n "$3" ]
-then
- mv ${freemind_dir} ${freemind_dir}.complete
- tar cvzf ${freemind_dfsg_tar}.complete.tar.gz \
- ${freemind_dir}.complete/freemind
- mv ${freemind_dir}.complete ${freemind_dir}
-fi
-
-### THEN CLEANUP THE SOURCE TREE ###
-find ${freemind_dir} -name \*.jar -o -name \*.zip | xargs rm -vf
-rm -vfr ${freemind_dir}/freemind/windows-launcher
-
-### CREATE ORIG.TAR.GZ ###
-if [ -f "${freemind_dfsg_tar}" ]
-then
- mv -f "${freemind_dfsg_tar}" "${freemind_dfsg_tar}.BAK" \
- || exit 1
-fi
-tar czf "${freemind_dfsg_tar}" "${freemind_dir}" || exit 1
-rm -fr "${freemind_dir}"
-cd "${CURDIR}"
Modified: trunk/freemind/debian/patches/02_build_xml_jibx.patch
===================================================================
--- trunk/freemind/debian/patches/02_build_xml_jibx.patch 2010-05-08
19:16:03 UTC (rev 12367)
+++ trunk/freemind/debian/patches/02_build_xml_jibx.patch 2010-05-08
19:20:44 UTC (rev 12368)
@@ -1,13 +1,3 @@
-From: Eric Lavarde <d...@zorglub.s.bawue.de>
-Date: Sat, 8 May 2010 16:56:56 +0200
-Subject: [PATCH] build against jibx-1.2
-
----
- freemind/build.xml | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/freemind/build.xml b/freemind/build.xml
-index 81685e3..9d4b769 100644
--- a/freemind/build.xml
+++ b/freemind/build.xml
@@ -38,8 +38,8 @@
@@ -16,8 +6,8 @@
<property name="jibxjar" value="lib/bindings.jar"/>
- <property name="jibxruntimelibs"
value="${jibxhome}/jibx-run.jar:${jibxhome}/xpp3.jar"/>
- <property name="jibxlibs"
value="${jibxhome}/bcel.jar:${jibxhome}/jibx-bind.jar:${jibxhome}/jibx-extras.jar:${jibxruntimelibs}"/>
-+ <property name="jibxruntimelibs"
value="${jibxhome}/jibx-run-1.2.jar:${jibxhome}/xpp3.jar"/>
-+ <property name="jibxlibs"
value="${jibxhome}/bcel.jar:${jibxhome}/jibx-bind-1.2.jar:${jibxhome}/jibx-extras-1.2.jar:${jibxruntimelibs}"/>
++ <property name="jibxruntimelibs"
value="${jibxhome}/jibx-run-1.1.6a.jar:${jibxhome}/xpp3.jar"/>
++ <property name="jibxlibs"
value="${jibxhome}/bcel.jar:${jibxhome}/jibx-bind-1.1.6a.jar:${jibxhome}/jibx-extras-1.1.6a.jar:${jibxruntimelibs}"/>
<taskdef name="bind" classname="org.jibx.binding.ant.CompileTask">
<classpath path="${jibxlibs}"/>
</taskdef>
Modified: trunk/freemind/debian/patches/03_freemind_sh.patch
===================================================================
--- trunk/freemind/debian/patches/03_freemind_sh.patch 2010-05-08 19:16:03 UTC
(rev 12367)
+++ trunk/freemind/debian/patches/03_freemind_sh.patch 2010-05-08 19:20:44 UTC
(rev 12368)
@@ -28,7 +28,7 @@
-${freedir}/lib/jibx/xpp3.jar:\
+/usr/share/java/SimplyHTML.jar:\
+/usr/share/java/gnu-regexp.jar:\
-+/usr/share/java/jibx-run-1.2.jar:\
++/usr/share/java/jibx-run-1.1.6a.jar:\
+/usr/share/java/xpp3.jar:\
${freedir}/lib/bindings.jar:\
-${freedir}/lib/commons-lang-2.0.jar:\
Added: trunk/freemind/debian/patches/05_freemind_sh_wrapper.patch
===================================================================
--- trunk/freemind/debian/patches/05_freemind_sh_wrapper.patch
(rev 0)
+++ trunk/freemind/debian/patches/05_freemind_sh_wrapper.patch 2010-05-08
19:20:44 UTC (rev 12368)
@@ -0,0 +1,106 @@
+--- freemind-0.9.0~rc7/freemind/freemind.sh 2010-05-08 13:29:31.000000000
+0200
++++ freemind-0.9.0~rc7.new/freemind/freemind.sh 2010-05-08
13:42:12.000000000 +0200
+@@ -47,45 +47,45 @@
+
+ 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)' \
++ if (! "${JAVA_CMD}" -version 2>&1 | grep -qe 'Java(TM)' \
+ -e 'OpenJDK')
+ then
+ _error "Your Java VM is not a complete implementation,"
\
+ "=======================================" \
+ "FREEMIND WILL MOST PROBABLY *NOT* WORK," \
+ "=======================================" \
+- "define JAVACMD, JAVA_BINDIR, JAVA_HOME or PATH
in order" \
++ "define JAVA_CMD, JAVA_BINDIR, JAVA_HOME or PATH
in order" \
+ "to point to such a VM. See the manpage of
freemind(1) for details."
+ JAVA_TYPE=other
+ else
+@@ -94,7 +94,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." \
+ "See the manpage of freemind(1) for details."
+ return 1
+ fi
+@@ -141,10 +141,16 @@
+ _source /etc/freemind/freemindrc
+ _source ~/.freemind/freemindrc
+
+-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 openjdk sun
++else
++ findjava
++ if [ $? -ne 0 ]
++ then
++ exit 1
++ fi
+ fi
+
+ output_debug_info
+@@ -207,11 +213,11 @@
+ ${freedir}"
+ if [ "${JAVA_TYPE}" = "sun" ]
+ then
+- _debug "Calling: '${JAVACMD} -Dfreemind.base.dir=${freedir} -cp
${CLASSPATH} freemind.main.FreeMindStarter $@'."
++ _debug "Calling: '${JAVA_CMD} -Dfreemind.base.dir=${freedir} -cp
${CLASSPATH} freemind.main.FreeMindStarter $@'."
+ ( echo "${DEBUG}" | grep -qe "exit" ) && exit 0 # do not start FreeMind
+- "${JAVACMD}" -Xmx256M -Dfreemind.base.dir="${freedir}" -cp
"${CLASSPATH}" freemind.main.FreeMindStarter "$@"
++ "${JAVA_CMD}" -Xmx256M -Dfreemind.base.dir="${freedir}" -cp
"${CLASSPATH}" freemind.main.FreeMindStarter "$@"
+ else # non-Sun environments don't work currently.
+- _debug "Calling: '${JAVACMD}
-Dgnu.java.awt.peer.gtk.Graphics=Graphics2D -Dfreemind.base.dir=${freedir} -cp
${CLASSPATH} freemind.main.FreeMindStarter $@'."
++ _debug "Calling: '${JAVA_CMD}
-Dgnu.java.awt.peer.gtk.Graphics=Graphics2D -Dfreemind.base.dir=${freedir} -cp
${CLASSPATH} freemind.main.FreeMindStarter $@'."
+ ( echo "${DEBUG}" | grep -qe "exit" ) && exit 0 # do not start FreeMind
+- "${JAVACMD}" -Xmx256M -Dgnu.java.awt.peer.gtk.Graphics=Graphics2D
-Dfreemind.base.dir="${freedir}" -cp "${CLASSPATH}"
freemind.main.FreeMindStarter "$@"
++ "${JAVA_CMD}" -Xmx256M -Dgnu.java.awt.peer.gtk.Graphics=Graphics2D
-Dfreemind.base.dir="${freedir}" -cp "${CLASSPATH}"
freemind.main.FreeMindStarter "$@"
+ fi
Modified: trunk/freemind/debian/patches/series
===================================================================
--- trunk/freemind/debian/patches/series 2010-05-08 19:16:03 UTC (rev
12367)
+++ trunk/freemind/debian/patches/series 2010-05-08 19:20:44 UTC (rev
12368)
@@ -2,6 +2,7 @@
02_build_xml_jibx.patch
02_manifest.patch
03_freemind_sh.patch
+05_freemind_sh_wrapper.patch
10_plug_collab_jabber.patch
11_plug_collab_jabber_build.patch
20_plug_svg.patch
Modified: trunk/freemind/debian/rules
===================================================================
--- trunk/freemind/debian/rules 2010-05-08 19:16:03 UTC (rev 12367)
+++ trunk/freemind/debian/rules 2010-05-08 19:20:44 UTC (rev 12368)
@@ -29,7 +29,6 @@
buildxml-clean::
-$(DEB_ANT_INVOKE) $(DEB_ANT_CLEAN_TARGET)
-# Get original sources directly from CVS or uscan
+# Get original sources directly using uscan
get-orig-source:
- #debian/export-freemind-cvs.sh 0.9.0~rc6 fm_0_9_0_rc6
- debian/export-freemind-cvs.sh uscan
+ uscan
Modified: trunk/freemind/debian/watch
===================================================================
--- trunk/freemind/debian/watch 2010-05-08 19:16:03 UTC (rev 12367)
+++ trunk/freemind/debian/watch 2010-05-08 19:20:44 UTC (rev 12368)
@@ -1,3 +1,3 @@
version=3
opts=dversionmangle=s/\+dfsg.*//,uversionmangle=s/(?i)_RC_?(\d+)$/~rc$1/;s/_Beta_?(\d+)$/~beta$1/;s/_/./g,
\
-
http://sf.net/freemind/freemind-src-([\d_.]+(?:_(?:(?i)rc|beta)_?\d+)?)\.(?:zip|tar\.gz)
+
http://sf.net/freemind/freemind-src-([\d_.]+(?:_(?:(?i)rc|beta)_?\d+)?)\.(?:zip|tar\.gz)
debian ./debian/clean-sources.sh
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
