[pkg-java] r13363 - in tags/freeplane: . 1.1.3-1/debian 1.1.3-1/debian/patches
Eric Lavarde
ewl-guest at alioth.debian.org
Sat Feb 26 15:49:00 UTC 2011
Author: ewl-guest
Date: 2011-02-26 15:48:58 +0000 (Sat, 26 Feb 2011)
New Revision: 13363
Added:
tags/freeplane/1.1.3-1/
tags/freeplane/1.1.3-1/debian/changelog
tags/freeplane/1.1.3-1/debian/control
tags/freeplane/1.1.3-1/debian/freeplane.bug-script
tags/freeplane/1.1.3-1/debian/patches/20_freeplane_sh.patch
tags/freeplane/1.1.3-1/debian/patches/40_no_winmac.patch
tags/freeplane/1.1.3-1/debian/patches/series
tags/freeplane/1.1.3-1/debian/rules
Removed:
tags/freeplane/1.1.3-1/debian/changelog
tags/freeplane/1.1.3-1/debian/control
tags/freeplane/1.1.3-1/debian/patches/40_no_winmac.patch
tags/freeplane/1.1.3-1/debian/patches/series
tags/freeplane/1.1.3-1/debian/rules
Log:
[svn-buildpackage] Tagging freeplane 1.1.3-1
Deleted: tags/freeplane/1.1.3-1/debian/changelog
===================================================================
--- trunk/freeplane/debian/changelog 2011-02-26 13:46:24 UTC (rev 13361)
+++ tags/freeplane/1.1.3-1/debian/changelog 2011-02-26 15:48:58 UTC (rev 13363)
@@ -1,5 +0,0 @@
-freeplane (1.1.1-1) unstable; urgency=low
-
- * Initial release (Closes: #566375).
-
- -- Eric Lavarde <deb at zorglub.s.bawue.de> Sun, 18 Jul 2010 09:26:51 +0200
Copied: tags/freeplane/1.1.3-1/debian/changelog (from rev 13362, trunk/freeplane/debian/changelog)
===================================================================
--- tags/freeplane/1.1.3-1/debian/changelog (rev 0)
+++ tags/freeplane/1.1.3-1/debian/changelog 2011-02-26 15:48:58 UTC (rev 13363)
@@ -0,0 +1,16 @@
+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).
+
+ -- Eric Lavarde <deb at zorglub.s.bawue.de> Sun, 18 Jul 2010 09:26:51 +0200
Deleted: tags/freeplane/1.1.3-1/debian/control
===================================================================
--- trunk/freeplane/debian/control 2011-02-26 13:46:24 UTC (rev 13361)
+++ tags/freeplane/1.1.3-1/debian/control 2011-02-26 15:48:58 UTC (rev 13363)
@@ -1,42 +0,0 @@
-Source: freeplane
-Section: editors
-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-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
-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
-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.
- .
- New features of Freeplane include:
- .
- * Export to PNG, JPEG, SVG (in addition to HTML / XHTML and PDF)
- * Find / Replace in all open maps
- * Paste HTML as node structure
- * Outline mode
- * Scripting via Groovy
- * Spell Checker
-
-Package: libjortho-freeplane-java
-Section: java
-Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | sun-java5-jre | sun-java6-jre
-Provides: libjortho-java
-Description: A Java spell-checking library.
- JOrtho (Java Orthography) is a spell-checker entirely written in Java.
- Its dictionaries are based on the free Wiktionary project and can therefore
- be updated for virtually any language.
- .
- The library works with any JTextComponent from the Swing frame work.
- This includes JTextPane, JEditorPane and JTextArea.
- .
- The version packaged is based on JOrtho 0.4, slightly adapted for the needs
- of Freeplane. See http://jortho.sourceforge.net/.
Copied: tags/freeplane/1.1.3-1/debian/control (from rev 13362, trunk/freeplane/debian/control)
===================================================================
--- tags/freeplane/1.1.3-1/debian/control (rev 0)
+++ tags/freeplane/1.1.3-1/debian/control 2011-02-26 15:48:58 UTC (rev 13363)
@@ -0,0 +1,42 @@
+Source: freeplane
+Section: editors
+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, 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.1.0
+Homepage: http://freeplane.org/
+
+Package: freeplane
+Architecture: all
+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.
+ .
+ New features of Freeplane include:
+ .
+ * Export to PNG, JPEG, SVG (in addition to HTML / XHTML and PDF)
+ * Find / Replace in all open maps
+ * Paste HTML as node structure
+ * Outline mode
+ * Scripting via Groovy
+ * Spell Checker
+
+Package: libjortho-freeplane-java
+Section: java
+Architecture: all
+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.
+ Its dictionaries are based on the free Wiktionary project and can therefore
+ be updated for virtually any language.
+ .
+ The library works with any JTextComponent from the Swing frame work.
+ This includes JTextPane, JEditorPane and JTextArea.
+ .
+ The version packaged is based on JOrtho 0.4, slightly adapted for the needs
+ of Freeplane. See http://jortho.sourceforge.net/.
Copied: tags/freeplane/1.1.3-1/debian/freeplane.bug-script (from rev 13362, trunk/freeplane/debian/freeplane.bug-script)
===================================================================
--- tags/freeplane/1.1.3-1/debian/freeplane.bug-script (rev 0)
+++ tags/freeplane/1.1.3-1/debian/freeplane.bug-script 2011-02-26 15:48:58 UTC (rev 13363)
@@ -0,0 +1,2 @@
+#!/bin/sh
+DEBUG=exit freeplane 1>&3 2>&3
Copied: tags/freeplane/1.1.3-1/debian/patches/20_freeplane_sh.patch (from rev 13362, trunk/freeplane/debian/patches/20_freeplane_sh.patch)
===================================================================
--- tags/freeplane/1.1.3-1/debian/patches/20_freeplane_sh.patch (rev 0)
+++ tags/freeplane/1.1.3-1/debian/patches/20_freeplane_sh.patch 2011-02-26 15:48:58 UTC (rev 13363)
@@ -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"\
Deleted: tags/freeplane/1.1.3-1/debian/patches/40_no_winmac.patch
===================================================================
--- trunk/freeplane/debian/patches/40_no_winmac.patch 2011-02-26 13:46:24 UTC (rev 13361)
+++ tags/freeplane/1.1.3-1/debian/patches/40_no_winmac.patch 2011-02-26 15:48:58 UTC (rev 13363)
@@ -1,11 +0,0 @@
---- a/freeplane_framework/ant/build.xml
-+++ b/freeplane_framework/ant/build.xml
-@@ -364,7 +364,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">
- <copy file="${workspace}/freeplane/doc/history_en.txt"
- todir="${dist}" />
- <copy file="${build}/bzrinfo.txt"
Copied: tags/freeplane/1.1.3-1/debian/patches/40_no_winmac.patch (from rev 13362, trunk/freeplane/debian/patches/40_no_winmac.patch)
===================================================================
--- tags/freeplane/1.1.3-1/debian/patches/40_no_winmac.patch (rev 0)
+++ tags/freeplane/1.1.3-1/debian/patches/40_no_winmac.patch 2011-02-26 15:48:58 UTC (rev 13363)
@@ -0,0 +1,11 @@
+--- a/freeplane_framework/ant/build.xml
++++ b/freeplane_framework/ant/build.xml
+@@ -367,7 +367,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">
+ <copy file="${workspace}/freeplane/doc/history_en.txt"
+ todir="${dist}" />
+ <copy file="${build}/bzrinfo.txt"
Deleted: tags/freeplane/1.1.3-1/debian/patches/series
===================================================================
--- trunk/freeplane/debian/patches/series 2011-02-26 13:46:24 UTC (rev 13361)
+++ tags/freeplane/1.1.3-1/debian/patches/series 2011-02-26 15:48:58 UTC (rev 13363)
@@ -1,6 +0,0 @@
-10_libraries_properties.patch
-15_libraries_manifest.patch
-40_no_winmac.patch
-50_no_copy_files.patch
-60_no_license_latex.patch
-70_skip_bugreport.patch
Copied: tags/freeplane/1.1.3-1/debian/patches/series (from rev 13362, trunk/freeplane/debian/patches/series)
===================================================================
--- tags/freeplane/1.1.3-1/debian/patches/series (rev 0)
+++ tags/freeplane/1.1.3-1/debian/patches/series 2011-02-26 15:48:58 UTC (rev 13363)
@@ -0,0 +1,7 @@
+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
+70_skip_bugreport.patch
Deleted: tags/freeplane/1.1.3-1/debian/rules
===================================================================
--- trunk/freeplane/debian/rules 2011-02-26 13:46:24 UTC (rev 13361)
+++ tags/freeplane/1.1.3-1/debian/rules 2011-02-26 15:48:58 UTC (rev 13363)
@@ -1,31 +0,0 @@
-#!/usr/bin/make -f
-# debian/rules for Commons Fileupload (uses CDBS)
-
-#clean:: buildxml-clean
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-# replaced by quilt: include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
-JAVA_HOME_DIRS := /usr/lib/jvm/java-6-openjdk
-
-DEB_ANT_BUILD_TARGET := build
-#DEB_BUILDDIR := .
-DEB_COMPRESS_EXCLUDE := .mm .pdf
-# DEB_INSTALL_DOCS_ALL = -Xlicense
-DEB_DH_INSTALL_ARGS := -XLICENSE.txt
-
-build:
- /usr/bin/docbook-to-man debian/freeplane.sgml > freeplane.1
- convert freeplane_framework/script/freeplane.png freeplane.xpm
-
-clean::
- -rm -f freeplane.xpm
- -rm -f freeplane.1
-
-#buildxml-clean::
-# -$(DEB_ANT_INVOKE) $(DEB_ANT_CLEAN_TARGET)
-
-# Get original sources directly using uscan
-get-orig-source:
- uscan --force-download
Copied: tags/freeplane/1.1.3-1/debian/rules (from rev 13362, trunk/freeplane/debian/rules)
===================================================================
--- tags/freeplane/1.1.3-1/debian/rules (rev 0)
+++ tags/freeplane/1.1.3-1/debian/rules 2011-02-26 15:48:58 UTC (rev 13363)
@@ -0,0 +1,31 @@
+#!/usr/bin/make -f
+# debian/rules for Commons Fileupload (uses CDBS)
+
+#clean:: buildxml-clean
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+# replaced by quilt: include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+JAVA_HOME_DIRS := /usr/lib/jvm/java-6-openjdk
+
+DEB_ANT_BUILD_TARGET := build
+#DEB_BUILDDIR := .
+DEB_COMPRESS_EXCLUDE := .mm .pdf
+# DEB_INSTALL_DOCS_ALL = -Xlicense
+DEB_DH_INSTALL_ARGS := -XLICENSE.txt
+
+build:
+ /usr/bin/docbook-to-man debian/freeplane.sgml > freeplane.1
+ convert freeplane_framework/script/freeplane.png freeplane.xpm
+
+clean::
+ -rm -f freeplane.xpm
+ -rm -f freeplane.1
+
+#buildxml-clean::
+# -$(DEB_ANT_INVOKE) $(DEB_ANT_CLEAN_TARGET)
+
+# Get original sources directly using uscan
+get-orig-source:
+ uscan --force-download --rename --repack
More information about the pkg-java-commits
mailing list