[pkg-java] r17294 - in trunk/freemind/debian: . patches
Markus Koschany
apo-guest at alioth.debian.org
Fri Oct 4 16:27:03 UTC 2013
Author: apo-guest
Date: 2013-10-04 16:27:02 +0000 (Fri, 04 Oct 2013)
New Revision: 17294
Added:
trunk/freemind/debian/patches/fix-shell-wrapper.patch
trunk/freemind/debian/patches/java-target-version.patch
trunk/freemind/debian/patches/jgoodies-build.patch
trunk/freemind/debian/patches/jgoodies-forms-1.6.patch
Removed:
trunk/freemind/debian/patches/03_freemind_sh.patch
Modified:
trunk/freemind/debian/changelog
trunk/freemind/debian/control
trunk/freemind/debian/patches/01_build_xml.patch
trunk/freemind/debian/patches/02_build_xml_jibx.patch
trunk/freemind/debian/patches/02_manifest.patch
trunk/freemind/debian/patches/05_freemind_sh_wrapper.patch
trunk/freemind/debian/patches/10_plug_collab_jabber.patch
trunk/freemind/debian/patches/11_plug_collab_jabber_build.patch
trunk/freemind/debian/patches/20_plug_svg.patch
trunk/freemind/debian/patches/21_plug_svg_build.patch
trunk/freemind/debian/patches/30_plug_help.patch
trunk/freemind/debian/patches/31_plug_help_build.patch
trunk/freemind/debian/patches/32_plug_help_manifest.patch
trunk/freemind/debian/patches/40_plug_script.patch
trunk/freemind/debian/patches/41_plug_script_build.patch
trunk/freemind/debian/patches/50_plug_latex_off.patch
trunk/freemind/debian/patches/series
Log:
Debian release 0.9.0+dfsg-3
Modified: trunk/freemind/debian/changelog
===================================================================
--- trunk/freemind/debian/changelog 2013-10-02 13:07:04 UTC (rev 17293)
+++ trunk/freemind/debian/changelog 2013-10-04 16:27:02 UTC (rev 17294)
@@ -1,3 +1,28 @@
+freemind (0.9.0+dfsg-3) unstable; urgency=low
+
+ * Team upload.
+ * Bump Standards-Version to 3.9.4, no changes.
+ * Require debhelper >= 9 and bump compat level to 9.
+ * Fix FTBFS with libjgoodies-forms-1.6. (Closes: #713144)
+ - Add jgoodies-forms-1.6.patch.
+ - Add jgoodies-build.patch.
+ - Add java-target-version.patch. Version 1.6 of jgoodies-forms-java
+ requires at least java 1.5.
+ This also fixes various regressions caused by the switch to
+ libjgoodies-forms-java 1.6.
+ * Add file URL list parameter (%U) to freemind.desktop, so users can double
+ click on data files and get the application to open them properly.
+ (Closes: #681219) Thanks to Marc Deslauriers for the report and patch.
+ * debian/control:
+ - freemind: Change Conflicts relation to Breaks and Replaces. Break against
+ a fixed version number and not against a dpkg-control substitution
+ variable.
+ - Use canonical VCS-URI.
+ * Add DEP3 headers to all patches.
+ * Rename 03_freemind_sh.patch to fix-shell-wrapper.patch.
+
+ -- Markus Koschany <apo at gambaru.de> Fri, 04 Oct 2013 17:35:40 +0200
+
freemind (0.9.0+dfsg-2) unstable; urgency=low
* Team upload.
Modified: trunk/freemind/debian/control
===================================================================
--- trunk/freemind/debian/control 2013-10-02 13:07:04 UTC (rev 17293)
+++ trunk/freemind/debian/control 2013-10-04 16:27:02 UTC (rev 17294)
@@ -6,19 +6,19 @@
# 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. JiBX 1.1 has been chosen for
# compatibility with Ubuntu.
-Build-Depends-Indep: docbook-to-man, ant, ant-optional, default-jdk, imagemagick, 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)
+Build-Depends-Indep: docbook-to-man, ant, ant-optional, default-jdk, imagemagick, libbatik-java (>= 1.6), rhino, libjgoodies-forms-java (>= 1.6), groovy, libjibx1.1-java | libjibx-java (>= 1.1), libjibx1.1-java | libjibx-java (<< 1.2), simplyhtml (>> 0.13), javahelp2, fop
+Build-Depends: debhelper (>= 9), cdbs (>= 0.4.8)
Homepage: http://freemind.sourceforge.net/
-Standards-Version: 3.9.2.0
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/freemind
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/freemind/
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/freemind
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/freemind/
Package: freemind
Architecture: all
-Depends: default-jre | sun-java6-jre, libjgoodies-forms-java, libjibx1.1-java | libjibx-java (>= 1.1), libjibx1.1-java | libjibx-java (<< 1.2), simplyhtml (>> 0.13), ${misc:Depends}
+Depends: default-jre | sun-java6-jre, libjgoodies-forms-java (>= 1.6), 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})
+Breaks: freemind-plugins-time (<< 0.9.0+dfsg-2)
Replaces: freemind-plugins-time
Description: Java Program for creating and viewing Mindmaps
Taking the Concept-Mapping approach to Human-Computer Interface design.
Modified: trunk/freemind/debian/patches/01_build_xml.patch
===================================================================
--- trunk/freemind/debian/patches/01_build_xml.patch 2013-10-02 13:07:04 UTC (rev 17293)
+++ trunk/freemind/debian/patches/01_build_xml.patch 2013-10-04 16:27:02 UTC (rev 17294)
@@ -1,3 +1,13 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Fri, 4 Oct 2013 13:10:23 +0200
+Subject: 01_build_xml
+
+---
+ freemind/build.xml | 35 ++++++-----------------------------
+ 1 file changed, 6 insertions(+), 29 deletions(-)
+
+diff --git a/freemind/build.xml b/freemind/build.xml
+index 3da2f49..cc55a9f 100644
--- a/freemind/build.xml
+++ b/freemind/build.xml
@@ -33,15 +33,10 @@
Modified: trunk/freemind/debian/patches/02_build_xml_jibx.patch
===================================================================
--- trunk/freemind/debian/patches/02_build_xml_jibx.patch 2013-10-02 13:07:04 UTC (rev 17293)
+++ trunk/freemind/debian/patches/02_build_xml_jibx.patch 2013-10-04 16:27:02 UTC (rev 17294)
@@ -1,3 +1,13 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Fri, 4 Oct 2013 13:10:23 +0200
+Subject: 02_build_xml_jibx
+
+---
+ freemind/build.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/freemind/build.xml b/freemind/build.xml
+index cc55a9f..0b0de1d 100644
--- a/freemind/build.xml
+++ b/freemind/build.xml
@@ -38,8 +38,8 @@
Modified: trunk/freemind/debian/patches/02_manifest.patch
===================================================================
--- trunk/freemind/debian/patches/02_manifest.patch 2013-10-02 13:07:04 UTC (rev 17293)
+++ trunk/freemind/debian/patches/02_manifest.patch 2013-10-04 16:27:02 UTC (rev 17294)
@@ -1,6 +1,15 @@
-diff -Nur freemind-0.9.0~beta9/freemind/MANIFEST.MF freemind-0.9.0~beta9.new/freemind/MANIFEST.MF
---- freemind-0.9.0~beta9/freemind/MANIFEST.MF 2007-01-04 01:13:26.000000000 +0100
-+++ freemind-0.9.0~beta9.new/freemind/MANIFEST.MF 2007-03-10 16:32:02.000000000 +0100
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Fri, 4 Oct 2013 13:10:23 +0200
+Subject: 02_manifest
+
+---
+ freemind/MANIFEST.MF | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/freemind/MANIFEST.MF b/freemind/MANIFEST.MF
+index e6db851..169b9fa 100644
+--- a/freemind/MANIFEST.MF
++++ b/freemind/MANIFEST.MF
@@ -1,13 +1,3 @@
Manifest-Version: 1.0
Main-Class: freemind.main.FreeMindStarter
Deleted: trunk/freemind/debian/patches/03_freemind_sh.patch
===================================================================
--- trunk/freemind/debian/patches/03_freemind_sh.patch 2013-10-02 13:07:04 UTC (rev 17293)
+++ trunk/freemind/debian/patches/03_freemind_sh.patch 2013-10-04 16:27:02 UTC (rev 17294)
@@ -1,37 +0,0 @@
-From: Eric Lavarde <deb at zorglub.s.bawue.de>
-Date: Sat, 8 May 2010 16:56:58 +0200
-Subject: [PATCH] fix shell wrapper
-
----
- freemind/freemind.sh | 13 ++++++++-----
- 1 files changed, 8 insertions(+), 5 deletions(-)
-
---- a/freemind/freemind.sh
-+++ b/freemind/freemind.sh
-@@ -94,7 +94,8 @@
- return 0
- else
- _error "Couldn't find a java virtual machine," \
-- "define JAVACMD, JAVA_BINDIR, JAVA_HOME or PATH."
-+ "define JAVACMD, JAVA_BINDIR, JAVA_HOME or PATH." \
-+ "See the manpage of freemind(1) for details."
- return 1
- fi
- }
-@@ -196,11 +197,12 @@
- # you want to add a new Look&Feel jar (the motif one is so ugly...).
- #
- CLASSPATH="${ADD_JARS}:${CLASSPATH}:${freedir}/lib/freemind.jar:\
--${freedir}/lib/jibx/jibx-run.jar:\
--${freedir}/lib/jibx/xpp3.jar:\
-+/usr/share/java/SimplyHTML.jar:\
-+/usr/share/java/gnu-regexp.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:\
--${freedir}/lib/forms-1.0.5.jar:\
-+/usr/share/java/forms.jar:\
- ${freedir}"
- if [ "${JAVA_TYPE}" = "sun" ]
- then
Modified: trunk/freemind/debian/patches/05_freemind_sh_wrapper.patch
===================================================================
--- trunk/freemind/debian/patches/05_freemind_sh_wrapper.patch 2013-10-02 13:07:04 UTC (rev 17293)
+++ trunk/freemind/debian/patches/05_freemind_sh_wrapper.patch 2013-10-04 16:27:02 UTC (rev 17294)
@@ -1,8 +1,17 @@
-Index: freemind-0.9.0+dfsg/freemind/freemind.sh
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Fri, 4 Oct 2013 13:10:23 +0200
+Subject: 05_freemind_sh_wrapper
+
===================================================================
---- freemind-0.9.0+dfsg.orig/freemind/freemind.sh 2011-02-26 12:06:01.000000000 +0100
-+++ freemind-0.9.0+dfsg/freemind/freemind.sh 2011-02-26 12:08:42.000000000 +0100
-@@ -22,6 +22,13 @@
+---
+ freemind/freemind.sh | 55 ++++++++++++++++++++++++++++++++--------------------
+ 1 file changed, 34 insertions(+), 21 deletions(-)
+
+diff --git a/freemind/freemind.sh b/freemind/freemind.sh
+index 20bb799..6533306 100644
+--- a/freemind/freemind.sh
++++ b/freemind/freemind.sh
+@@ -22,6 +22,13 @@ then
set -x
fi
@@ -16,7 +25,7 @@
########## FUNCTIONS DEFINITIONS #######################################
_debug() {
-@@ -47,45 +54,45 @@
+@@ -47,45 +54,45 @@ _error() {
findjava() {
# We try hard to find the proper 'java' command
@@ -74,7 +83,7 @@
"to point to such a VM. See the manpage of freemind(1) for details."
JAVA_TYPE=other
else
-@@ -94,7 +101,7 @@
+@@ -94,7 +101,7 @@ findjava() {
return 0
else
_error "Couldn't find a java virtual machine," \
@@ -83,7 +92,7 @@
"See the manpage of freemind(1) for details."
return 1
fi
-@@ -141,10 +148,16 @@
+@@ -141,10 +148,16 @@ output_debug_info() {
_source /etc/freemind/freemindrc
_source ~/.freemind/freemindrc
@@ -104,7 +113,7 @@
fi
output_debug_info
-@@ -206,11 +219,11 @@
+@@ -206,11 +219,11 @@ ${freedir}/lib/bindings.jar:\
${freedir}"
if [ "${JAVA_TYPE}" = "sun" ]
then
Modified: trunk/freemind/debian/patches/10_plug_collab_jabber.patch
===================================================================
--- trunk/freemind/debian/patches/10_plug_collab_jabber.patch 2013-10-02 13:07:04 UTC (rev 17293)
+++ trunk/freemind/debian/patches/10_plug_collab_jabber.patch 2013-10-04 16:27:02 UTC (rev 17294)
@@ -1,5 +1,15 @@
---- f/freemind/plugins/CollaborationJabber.xml
-+++ f/freemind/plugins/CollaborationJabber.xml
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Fri, 4 Oct 2013 13:10:23 +0200
+Subject: 10_plug_collab_jabber
+
+---
+ freemind/plugins/CollaborationJabber.xml | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/freemind/plugins/CollaborationJabber.xml b/freemind/plugins/CollaborationJabber.xml
+index 0663120..3ad6503 100644
+--- a/freemind/plugins/CollaborationJabber.xml
++++ b/freemind/plugins/CollaborationJabber.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<plugin label="/collaboration/jabber/jabber">
Modified: trunk/freemind/debian/patches/11_plug_collab_jabber_build.patch
===================================================================
--- trunk/freemind/debian/patches/11_plug_collab_jabber_build.patch 2013-10-02 13:07:04 UTC (rev 17293)
+++ trunk/freemind/debian/patches/11_plug_collab_jabber_build.patch 2013-10-04 16:27:02 UTC (rev 17294)
@@ -1,3 +1,13 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Fri, 4 Oct 2013 13:10:23 +0200
+Subject: 11_plug_collab_jabber_build
+
+---
+ freemind/plugins/build_jabber.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/freemind/plugins/build_jabber.xml b/freemind/plugins/build_jabber.xml
+index 61133fa..307bf34 100644
--- a/freemind/plugins/build_jabber.xml
+++ b/freemind/plugins/build_jabber.xml
@@ -5,10 +5,10 @@
Modified: trunk/freemind/debian/patches/20_plug_svg.patch
===================================================================
--- trunk/freemind/debian/patches/20_plug_svg.patch 2013-10-02 13:07:04 UTC (rev 17293)
+++ trunk/freemind/debian/patches/20_plug_svg.patch 2013-10-04 16:27:02 UTC (rev 17294)
@@ -1,7 +1,16 @@
-Index: freemind-0.9.0~rc6+dfsg/freemind/plugins/ExportSvg.xml
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Fri, 4 Oct 2013 13:10:23 +0200
+Subject: 20_plug_svg
+
===================================================================
---- freemind-0.9.0~rc6+dfsg.orig/freemind/plugins/ExportSvg.xml 2009-02-16 22:27:17.000000000 +0100
-+++ freemind-0.9.0~rc6+dfsg/freemind/plugins/ExportSvg.xml 2010-05-08 16:47:29.000000000 +0200
+---
+ freemind/plugins/ExportSvg.xml | 33 +++++++++++----------------------
+ 1 file changed, 11 insertions(+), 22 deletions(-)
+
+diff --git a/freemind/plugins/ExportSvg.xml b/freemind/plugins/ExportSvg.xml
+index 54e1c7e..1a1db99 100644
+--- a/freemind/plugins/ExportSvg.xml
++++ b/freemind/plugins/ExportSvg.xml
@@ -1,27 +1,16 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<plugin label="plugins/ExportPdf">
Modified: trunk/freemind/debian/patches/21_plug_svg_build.patch
===================================================================
--- trunk/freemind/debian/patches/21_plug_svg_build.patch 2013-10-02 13:07:04 UTC (rev 17293)
+++ trunk/freemind/debian/patches/21_plug_svg_build.patch 2013-10-04 16:27:02 UTC (rev 17294)
@@ -1,3 +1,13 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Fri, 4 Oct 2013 13:10:23 +0200
+Subject: 21_plug_svg_build
+
+---
+ freemind/plugins/build_svg.xml | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/freemind/plugins/build_svg.xml b/freemind/plugins/build_svg.xml
+index 04f46d4..e7fc4e6 100644
--- a/freemind/plugins/build_svg.xml
+++ b/freemind/plugins/build_svg.xml
@@ -7,9 +7,8 @@
Modified: trunk/freemind/debian/patches/30_plug_help.patch
===================================================================
--- trunk/freemind/debian/patches/30_plug_help.patch 2013-10-02 13:07:04 UTC (rev 17293)
+++ trunk/freemind/debian/patches/30_plug_help.patch 2013-10-04 16:27:02 UTC (rev 17294)
@@ -1,5 +1,15 @@
---- f/freemind/plugins/FreemindHelp.xml
-+++ f/freemind/plugins/FreemindHelp.xml
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Fri, 4 Oct 2013 13:10:23 +0200
+Subject: 30_plug_help
+
+---
+ freemind/plugins/FreemindHelp.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/freemind/plugins/FreemindHelp.xml b/freemind/plugins/FreemindHelp.xml
+index 02ca9d9..c9a94f1 100644
+--- a/freemind/plugins/FreemindHelp.xml
++++ b/freemind/plugins/FreemindHelp.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<plugin label="plugins/FreemindHelp">
Modified: trunk/freemind/debian/patches/31_plug_help_build.patch
===================================================================
--- trunk/freemind/debian/patches/31_plug_help_build.patch 2013-10-02 13:07:04 UTC (rev 17293)
+++ trunk/freemind/debian/patches/31_plug_help_build.patch 2013-10-04 16:27:02 UTC (rev 17294)
@@ -1,3 +1,13 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Fri, 4 Oct 2013 13:10:23 +0200
+Subject: 31_plug_help_build
+
+---
+ freemind/plugins/build_help.xml | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/freemind/plugins/build_help.xml b/freemind/plugins/build_help.xml
+index 42bc699..15e1752 100644
--- a/freemind/plugins/build_help.xml
+++ b/freemind/plugins/build_help.xml
@@ -5,10 +5,10 @@
Modified: trunk/freemind/debian/patches/32_plug_help_manifest.patch
===================================================================
--- trunk/freemind/debian/patches/32_plug_help_manifest.patch 2013-10-02 13:07:04 UTC (rev 17293)
+++ trunk/freemind/debian/patches/32_plug_help_manifest.patch 2013-10-04 16:27:02 UTC (rev 17294)
@@ -1,5 +1,15 @@
---- f/freemind/plugins/help/doc/manifest.mf
-+++ f/freemind/plugins/help/doc/manifest.mf
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Fri, 4 Oct 2013 13:10:23 +0200
+Subject: 32_plug_help_manifest
+
+---
+ freemind/plugins/help/doc/manifest.mf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/freemind/plugins/help/doc/manifest.mf b/freemind/plugins/help/doc/manifest.mf
+index 763b061..c946b2f 100644
+--- a/freemind/plugins/help/doc/manifest.mf
++++ b/freemind/plugins/help/doc/manifest.mf
@@ -1,4 +1,4 @@
Main-Class: sunw.demo.jhdemo.Runner
Run-Class: sunw.demo.jhdemo.JHLauncher
Modified: trunk/freemind/debian/patches/40_plug_script.patch
===================================================================
--- trunk/freemind/debian/patches/40_plug_script.patch 2013-10-02 13:07:04 UTC (rev 17293)
+++ trunk/freemind/debian/patches/40_plug_script.patch 2013-10-04 16:27:02 UTC (rev 17294)
@@ -1,6 +1,15 @@
-diff -Nur -x '*.orig' -x '*~' freemind-0.9.0~rc1/freemind/plugins/ScriptingEngine.xml freemind-0.9.0~rc1.new/freemind/plugins/ScriptingEngine.xml
---- freemind-0.9.0~rc1/freemind/plugins/ScriptingEngine.xml 2008-07-18 21:02:52.000000000 +0200
-+++ freemind-0.9.0~rc1.new/freemind/plugins/ScriptingEngine.xml 2009-02-22 20:07:36.000000000 +0100
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Fri, 4 Oct 2013 13:10:23 +0200
+Subject: 40_plug_script
+
+---
+ freemind/plugins/ScriptingEngine.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/freemind/plugins/ScriptingEngine.xml b/freemind/plugins/ScriptingEngine.xml
+index 14eac34..a112046 100644
+--- a/freemind/plugins/ScriptingEngine.xml
++++ b/freemind/plugins/ScriptingEngine.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<plugin label="plugins/ScriptingEngine">
Modified: trunk/freemind/debian/patches/41_plug_script_build.patch
===================================================================
--- trunk/freemind/debian/patches/41_plug_script_build.patch 2013-10-02 13:07:04 UTC (rev 17293)
+++ trunk/freemind/debian/patches/41_plug_script_build.patch 2013-10-04 16:27:02 UTC (rev 17294)
@@ -1,3 +1,13 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Fri, 4 Oct 2013 13:10:24 +0200
+Subject: 41_plug_script_build
+
+---
+ freemind/plugins/build_scripting.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/freemind/plugins/build_scripting.xml b/freemind/plugins/build_scripting.xml
+index 9b9c650..3786792 100644
--- a/freemind/plugins/build_scripting.xml
+++ b/freemind/plugins/build_scripting.xml
@@ -5,9 +5,9 @@
Modified: trunk/freemind/debian/patches/50_plug_latex_off.patch
===================================================================
--- trunk/freemind/debian/patches/50_plug_latex_off.patch 2013-10-02 13:07:04 UTC (rev 17293)
+++ trunk/freemind/debian/patches/50_plug_latex_off.patch 2013-10-04 16:27:02 UTC (rev 17294)
@@ -1,3 +1,13 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Fri, 4 Oct 2013 13:10:24 +0200
+Subject: 50_plug_latex_off
+
+---
+ freemind/plugins/build.xml | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/freemind/plugins/build.xml b/freemind/plugins/build.xml
+index 477c61e..194f385 100644
--- a/freemind/plugins/build.xml
+++ b/freemind/plugins/build.xml
@@ -24,6 +24,7 @@
Added: trunk/freemind/debian/patches/fix-shell-wrapper.patch
===================================================================
--- trunk/freemind/debian/patches/fix-shell-wrapper.patch (rev 0)
+++ trunk/freemind/debian/patches/fix-shell-wrapper.patch 2013-10-04 16:27:02 UTC (rev 17294)
@@ -0,0 +1,39 @@
+From: Eric Lavarde <deb at zorglub.s.bawue.de>
+Date: Sat, 8 May 2010 16:56:58 +0200
+Subject: fix shell wrapper
+
+---
+ freemind/freemind.sh | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/freemind/freemind.sh b/freemind/freemind.sh
+index 5cd29ee..20bb799 100644
+--- a/freemind/freemind.sh
++++ b/freemind/freemind.sh
+@@ -94,7 +94,8 @@ findjava() {
+ return 0
+ else
+ _error "Couldn't find a java virtual machine," \
+- "define JAVACMD, JAVA_BINDIR, JAVA_HOME or PATH."
++ "define JAVACMD, JAVA_BINDIR, JAVA_HOME or PATH." \
++ "See the manpage of freemind(1) for details."
+ return 1
+ fi
+ }
+@@ -196,11 +197,12 @@ fi
+ # you want to add a new Look&Feel jar (the motif one is so ugly...).
+ #
+ CLASSPATH="${ADD_JARS}:${CLASSPATH}:${freedir}/lib/freemind.jar:\
+-${freedir}/lib/jibx/jibx-run.jar:\
+-${freedir}/lib/jibx/xpp3.jar:\
++/usr/share/java/SimplyHTML.jar:\
++/usr/share/java/gnu-regexp.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:\
+-${freedir}/lib/forms-1.0.5.jar:\
++/usr/share/java/forms.jar:\
+ ${freedir}"
+ if [ "${JAVA_TYPE}" = "sun" ]
+ then
Added: trunk/freemind/debian/patches/java-target-version.patch
===================================================================
--- trunk/freemind/debian/patches/java-target-version.patch (rev 0)
+++ trunk/freemind/debian/patches/java-target-version.patch 2013-10-04 16:27:02 UTC (rev 17294)
@@ -0,0 +1,27 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Fri, 4 Oct 2013 13:50:38 +0200
+Subject: java target version
+
+Use java target version 1.5 to make freemind compile with
+jgoodies-forms-java 1.6
+
+
+---
+ freemind/build.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/freemind/build.xml b/freemind/build.xml
+index 0b0de1d..ed19e60 100644
+--- a/freemind/build.xml
++++ b/freemind/build.xml
+@@ -30,8 +30,8 @@
+ <property name="FM.jar" location="${dist.lib}/freemind.jar"/>
+ <property name="post" location="../post" />
+ <property name="debug" value="on" />
+- <property name="java_source_version" value="1.4" />
+- <property name="java_target_version" value="1.4" />
++ <property name="java_source_version" value="1.5" />
++ <property name="java_target_version" value="1.5" />
+ <property name="build.compiler" value="modern" />
+ <property name="java.dir" value="/usr/share/java" />
+
Added: trunk/freemind/debian/patches/jgoodies-build.patch
===================================================================
--- trunk/freemind/debian/patches/jgoodies-build.patch (rev 0)
+++ trunk/freemind/debian/patches/jgoodies-build.patch 2013-10-04 16:27:02 UTC (rev 17294)
@@ -0,0 +1,21 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Fri, 4 Oct 2013 13:12:46 +0200
+Subject: jgoodies build
+
+---
+ freemind/freemind/preferences/layout/OptionPanel.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/freemind/freemind/preferences/layout/OptionPanel.java b/freemind/freemind/preferences/layout/OptionPanel.java
+index 19a6951..e9a3cfe 100644
+--- a/freemind/freemind/preferences/layout/OptionPanel.java
++++ b/freemind/freemind/preferences/layout/OptionPanel.java
+@@ -400,7 +400,7 @@ public class OptionPanel implements TextTranslator {
+ JLabel label = new JLabel(labelText, icon, JLabel.RIGHT);
+ label.setToolTipText(pTranslator.getText(getDescription()));
+ if(rowSpec == null){
+- rowSpec = new RowSpec("fill:20dlu");
++ rowSpec = RowSpec.decode("fill:20dlu");
+ }
+ if( 3 < builder.getColumn()){
+ builder.appendRelatedComponentsGapRow();
Added: trunk/freemind/debian/patches/jgoodies-forms-1.6.patch
===================================================================
--- trunk/freemind/debian/patches/jgoodies-forms-1.6.patch (rev 0)
+++ trunk/freemind/debian/patches/jgoodies-forms-1.6.patch 2013-10-04 16:27:02 UTC (rev 17294)
@@ -0,0 +1,110 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Fri, 4 Oct 2013 13:17:20 +0200
+Subject: jgoodies forms 1.6
+
+---
+ .../accessories/plugins/dialogs/ManagePatternsPopupDialog.java | 4 ++--
+ freemind/accessories/plugins/time/TimeList.java | 8 ++++----
+ freemind/freemind/preferences/layout/OptionPanel.java | 4 ++--
+ freemind/plugins/collaboration/database/DatabaseBasics.java | 4 ++--
+ 4 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/freemind/accessories/plugins/dialogs/ManagePatternsPopupDialog.java b/freemind/accessories/plugins/dialogs/ManagePatternsPopupDialog.java
+index a55028e..b066f0f 100644
+--- a/freemind/accessories/plugins/dialogs/ManagePatternsPopupDialog.java
++++ b/freemind/accessories/plugins/dialogs/ManagePatternsPopupDialog.java
+@@ -58,7 +58,7 @@ import javax.swing.ListSelectionModel;
+ import javax.swing.event.ListSelectionEvent;
+ import javax.swing.event.ListSelectionListener;
+
+-import com.jgoodies.forms.factories.ButtonBarFactory;
++import com.jgoodies.forms.builder.ButtonBarBuilder;
+
+ import freemind.common.TextTranslator;
+ import freemind.common.XmlBindingTools;
+@@ -454,7 +454,7 @@ public class ManagePatternsPopupDialog extends JDialog implements
+ jContentPane.add(mSplitPane, new GridBagConstraints(0,
+ 0, 2, 1, 1.0, 8.0, GridBagConstraints.WEST,
+ GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
+- jContentPane.add(ButtonBarFactory.buildOKCancelBar(getJCancelButton(), getJOKButton()),
++ jContentPane.add(new ButtonBarBuilder().addGlue().addButton(getJCancelButton(), getJOKButton()).build(),
+ new GridBagConstraints(1, 1, 1, 1,
+ 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE,
+ new Insets(0, 0, 0, 0), 0, 0));
+diff --git a/freemind/accessories/plugins/time/TimeList.java b/freemind/accessories/plugins/time/TimeList.java
+index b7eb212..80d03c2 100644
+--- a/freemind/accessories/plugins/time/TimeList.java
++++ b/freemind/accessories/plugins/time/TimeList.java
+@@ -72,7 +72,7 @@ import javax.swing.table.TableCellRenderer;
+ import javax.swing.text.BadLocationException;
+ import javax.swing.text.Document;
+
+-import com.jgoodies.forms.factories.ButtonBarFactory;
++import com.jgoodies.forms.builder.ButtonBarBuilder2;
+
+ import freemind.controller.BlindIcon;
+ import freemind.controller.StructuredMenuHolder;
+@@ -295,14 +295,14 @@ public class TimeList extends MindMapHookAdapter {
+ exportAction.setEnabled(false);
+ replaceSelectedAction.setEnabled(false);
+
+- JPanel bar = ButtonBarFactory.buildGrowingBar(new JButton[]{
++ JPanel bar = new ButtonBarBuilder2().addGrowing(
+ cancelButton,
+ exportButton,
+ replaceAllButton,
+ replaceSelectedButton,
+ gotoButton,
+- selectButton,
+- });
++ selectButton
++ ).build();
+ contentPane.add(/*new JScrollPane*/(bar), new GridBagConstraints(0,6,1, 1, 1.0, 1.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
+
+ JMenuBar menuBar = new JMenuBar();
+diff --git a/freemind/freemind/preferences/layout/OptionPanel.java b/freemind/freemind/preferences/layout/OptionPanel.java
+index e9a3cfe..ceba697 100644
+--- a/freemind/freemind/preferences/layout/OptionPanel.java
++++ b/freemind/freemind/preferences/layout/OptionPanel.java
+@@ -51,8 +51,8 @@ import javax.swing.JSplitPane;
+ import javax.swing.UIManager;
+ import javax.swing.UIManager.LookAndFeelInfo;
+
++import com.jgoodies.forms.builder.ButtonBarBuilder;
+ import com.jgoodies.forms.builder.DefaultFormBuilder;
+-import com.jgoodies.forms.factories.ButtonBarFactory;
+ import com.jgoodies.forms.layout.FormLayout;
+ import com.jgoodies.forms.layout.RowSpec;
+
+@@ -234,7 +234,7 @@ public class OptionPanel implements TextTranslator {
+ });
+ frame.getRootPane().setDefaultButton(okButton);
+ frame.getContentPane().add(
+- ButtonBarFactory.buildOKCancelBar(cancelButton, okButton),
++ new ButtonBarBuilder().addGlue().addButton(cancelButton, okButton).build(),
+ BorderLayout.SOUTH);
+ }
+
+diff --git a/freemind/plugins/collaboration/database/DatabaseBasics.java b/freemind/plugins/collaboration/database/DatabaseBasics.java
+index ed712b2..4f64f21 100644
+--- a/freemind/plugins/collaboration/database/DatabaseBasics.java
++++ b/freemind/plugins/collaboration/database/DatabaseBasics.java
+@@ -41,8 +41,8 @@ import javax.swing.JButton;
+ import javax.swing.JDialog;
+ import javax.swing.WindowConstants;
+
++import com.jgoodies.forms.builder.ButtonBarBuilder;
+ import com.jgoodies.forms.builder.DefaultFormBuilder;
+-import com.jgoodies.forms.factories.ButtonBarFactory;
+ import com.jgoodies.forms.layout.FormLayout;
+
+ import freemind.common.NumberProperty;
+@@ -169,7 +169,7 @@ public class DatabaseBasics extends MindMapNodeHookAdapter {
+ });
+ getRootPane().setDefaultButton(mOkButton);
+ getContentPane().add(
+- ButtonBarFactory.buildOKCancelBar(cancelButton, mOkButton),
++ new ButtonBarBuilder().addGlue().addButton(cancelButton, mOkButton).build(),
+ BorderLayout.SOUTH);
+ setTitle("Enter Password Dialog");
+ setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
Modified: trunk/freemind/debian/patches/series
===================================================================
--- trunk/freemind/debian/patches/series 2013-10-02 13:07:04 UTC (rev 17293)
+++ trunk/freemind/debian/patches/series 2013-10-04 16:27:02 UTC (rev 17294)
@@ -1,7 +1,7 @@
01_build_xml.patch
02_build_xml_jibx.patch
02_manifest.patch
-03_freemind_sh.patch
+fix-shell-wrapper.patch
05_freemind_sh_wrapper.patch
10_plug_collab_jabber.patch
11_plug_collab_jabber_build.patch
@@ -13,3 +13,6 @@
40_plug_script.patch
41_plug_script_build.patch
50_plug_latex_off.patch
+jgoodies-build.patch
+jgoodies-forms-1.6.patch
+java-target-version.patch
More information about the pkg-java-commits
mailing list