Author: twerner Date: 2010-05-08 15:34:34 +0000 (Sat, 08 May 2010) New Revision: 12359
Added: trunk/freemind/debian/patches/series trunk/freemind/debian/source/ trunk/freemind/debian/source/format 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/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/32_plug_help_manifest.patch trunk/freemind/debian/rules Log: UNRELEASED * Switch to source format 3.0. * Switch to libjibx1.2-java. Modified: trunk/freemind/debian/changelog =================================================================== --- trunk/freemind/debian/changelog 2010-05-08 14:34:28 UTC (rev 12358) +++ trunk/freemind/debian/changelog 2010-05-08 15:34:34 UTC (rev 12359) @@ -1,3 +1,11 @@ +freemind (0.9.0~rc6+dfsg-4) unstable; urgency=low + + UNRELEASED + * Switch to source format 3.0. + * Switch to libjibx1.2-java. + + -- Torsten Werner <[email protected]> Sat, 08 May 2010 17:32:37 +0200 + freemind (0.9.0~rc6+dfsg-3) unstable; urgency=low * Build depend on Ant (optional) 1.7 to avoid FTBFS with Ant 1.8 Modified: trunk/freemind/debian/control =================================================================== --- trunk/freemind/debian/control 2010-05-08 14:34:28 UTC (rev 12358) +++ trunk/freemind/debian/control 2010-05-08 15:34:34 UTC (rev 12359) @@ -5,14 +5,14 @@ Uploaders: Eric Lavarde <[email protected]> # 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.1-java | libjibx-java (>= 1.1), libjibx1.1-java | libjibx-java (<< 1.2), 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.2-java | libjibx-java (>= 1.1), libjibx1.2-java | libjibx-java (<< 1.3), 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 Package: freemind Architecture: all -Depends: openjdk-6-jre | sun-java5-jre | sun-java6-jre | java2-runtime, 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} +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 Suggests: freemind-plugins-help, freemind-plugins-svg, freemind-plugins-script, freemind-browser Conflicts: freemind-plugins-time (<< ${binary:Version}) Modified: trunk/freemind/debian/patches/02_build_xml_jibx.patch =================================================================== --- trunk/freemind/debian/patches/02_build_xml_jibx.patch 2010-05-08 14:34:28 UTC (rev 12358) +++ trunk/freemind/debian/patches/02_build_xml_jibx.patch 2010-05-08 15:34:34 UTC (rev 12359) @@ -1,14 +1,24 @@ -diff -Nur -x '*.orig' -x '*~' freemind-0.9.0~rc6+dfsg/freemind/build.xml freemind-0.9.0~rc6+dfsg.new/freemind/build.xml ---- freemind-0.9.0~rc6+dfsg/freemind/build.xml 2010-02-06 15:16:35.000000000 +0100 -+++ freemind-0.9.0~rc6+dfsg.new/freemind/build.xml 2010-02-06 15:17:21.000000000 +0100 +From: Eric Lavarde <[email protected]> +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 @@ <!-- begin generator part --> <property name="jibxhome" value="${java.dir}"/> <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.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}"/> ++ <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}"/> <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 14:34:28 UTC (rev 12358) +++ trunk/freemind/debian/patches/03_freemind_sh.patch 2010-05-08 15:34:34 UTC (rev 12359) @@ -1,7 +1,16 @@ -diff -Nur -x '*.orig' -x '*~' freemind-0.9.0~rc4/freemind/freemind.sh freemind-0.9.0~rc4.new/freemind/freemind.sh ---- freemind-0.9.0~rc4/freemind/freemind.sh 2008-12-25 22:34:05.000000000 +0100 -+++ freemind-0.9.0~rc4.new/freemind/freemind.sh 2009-05-24 09:18:13.000000000 +0200 -@@ -94,7 +94,8 @@ +From: Eric Lavarde <[email protected]> +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(-) + +diff --git a/freemind/freemind.sh b/freemind/freemind.sh +index 5cd29ee..0bb2dc9 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," \ @@ -11,7 +20,7 @@ return 1 fi } -@@ -196,11 +197,13 @@ +@@ -196,11 +197,13 @@ fi # you want to add a new Look&Feel jar (the motif one is so ugly...). # CLASSPATH="${ADD_JARS}:${CLASSPATH}:${freedir}/lib/freemind.jar:\ @@ -19,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.1.6a.jar:\ ++/usr/share/java/jibx-run-1.2.jar:\ +/usr/share/java/xpp3.jar:\ ${freedir}/lib/bindings.jar:\ -${freedir}/lib/commons-lang-2.0.jar:\ @@ -29,3 +38,4 @@ ${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 2010-05-08 14:34:28 UTC (rev 12358) +++ trunk/freemind/debian/patches/10_plug_collab_jabber.patch 2010-05-08 15:34:34 UTC (rev 12359) @@ -1,5 +1,5 @@ ---- freemind/plugins/CollaborationJabber.xml -+++ freemind/plugins/CollaborationJabber.xml +--- f/freemind/plugins/CollaborationJabber.xml ++++ f/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 2010-05-08 14:34:28 UTC (rev 12358) +++ trunk/freemind/debian/patches/11_plug_collab_jabber_build.patch 2010-05-08 15:34:34 UTC (rev 12359) @@ -1,5 +1,5 @@ ---- freemind/plugins/build_jabber.xml -+++ freemind/plugins/build_jabber.xml +--- f/freemind/plugins/build_jabber.xml ++++ f/freemind/plugins/build_jabber.xml @@ -4,10 +4,10 @@ <property name="plugin.dir" value="plugins/collaboration/jabber"/> <property name="plugin.jar" value="jabber_plugin.jar" /> Modified: trunk/freemind/debian/patches/20_plug_svg.patch =================================================================== --- trunk/freemind/debian/patches/20_plug_svg.patch 2010-05-08 14:34:28 UTC (rev 12358) +++ trunk/freemind/debian/patches/20_plug_svg.patch 2010-05-08 15:34:34 UTC (rev 12359) @@ -1,8 +1,10 @@ ---- freemind-0.8.0/freemind/plugins/ExportSvg.xml 2005-10-22 15:07:23.000000000 +0000 -+++ ExportSvg.xml 2005-10-22 15:07:04.000000000 +0000 +Index: freemind-0.9.0~rc6+dfsg/freemind/plugins/ExportSvg.xml +=================================================================== +--- 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 @@ -1,27 +1,16 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> - <plugin label="plugins/ExportPdf"> + <plugin label="plugins/ExportPdf"> <plugin_classpath jar="svg/svg_plugin.jar"/> - <plugin_classpath jar="svg/batik-awt-util.jar"/> - <plugin_classpath jar="svg/batik-bridge.jar"/> @@ -38,9 +40,9 @@ <plugin_action documentation="%plugins/ExportPdf.xml_documentation" name="%plugins/ExportPdf.xml_name" base="freemind.extensions.ModeControllerHookAdapter" -@@ -38,4 +25,4 @@ +@@ -38,4 +27,4 @@ <plugin_mode class_name="freemind.modes.mindmapmode"/> - <plugin_menu location="menu_bar/file/export/svg_export"/> + <plugin_menu location="menu_bar/file/export/pdf/svg_export"/> </plugin_action> -</plugin> \ No newline at end of file Modified: trunk/freemind/debian/patches/21_plug_svg_build.patch =================================================================== --- trunk/freemind/debian/patches/21_plug_svg_build.patch 2010-05-08 14:34:28 UTC (rev 12358) +++ trunk/freemind/debian/patches/21_plug_svg_build.patch 2010-05-08 15:34:34 UTC (rev 12359) @@ -1,5 +1,7 @@ ---- freemind-0.8.0/freemind/plugins/build_svg.xml 2005-10-22 14:04:46.000000000 +0000 -+++ build_svg.xml 2005-10-22 14:03:17.000000000 +0000 +Index: freemind-0.9.0~rc6+dfsg/freemind/plugins/build_svg.xml +=================================================================== +--- freemind-0.9.0~rc6+dfsg.orig/freemind/plugins/build_svg.xml 2010-05-08 16:55:28.000000000 +0200 ++++ freemind-0.9.0~rc6+dfsg/freemind/plugins/build_svg.xml 2010-05-08 16:55:38.000000000 +0200 @@ -6,9 +6,9 @@ <property name="plugin.zip" value="svg_plugin-${ver}.zip" /> <!-- <property name="additional.lib" value="${plugin.dir}/batik-awt-util.jar:${plugin.dir}/batik-dom.jar:${plugin.dir}/batik-svggen.jar:${plugin.dir}/batik-util.jar:${plugin.dir}/batik-xml.jar"/> Modified: trunk/freemind/debian/patches/30_plug_help.patch =================================================================== --- trunk/freemind/debian/patches/30_plug_help.patch 2010-05-08 14:34:28 UTC (rev 12358) +++ trunk/freemind/debian/patches/30_plug_help.patch 2010-05-08 15:34:34 UTC (rev 12359) @@ -1,5 +1,5 @@ ---- freemind/plugins/FreemindHelp.xml -+++ freemind/plugins/FreemindHelp.xml +--- f/freemind/plugins/FreemindHelp.xml ++++ f/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/32_plug_help_manifest.patch =================================================================== --- trunk/freemind/debian/patches/32_plug_help_manifest.patch 2010-05-08 14:34:28 UTC (rev 12358) +++ trunk/freemind/debian/patches/32_plug_help_manifest.patch 2010-05-08 15:34:34 UTC (rev 12359) @@ -1,5 +1,5 @@ ---- freemind/plugins/help/doc/manifest.mf -+++ freemind/plugins/help/doc/manifest.mf +--- f/freemind/plugins/help/doc/manifest.mf ++++ f/freemind/plugins/help/doc/manifest.mf @@ -1,4 +1,4 @@ Main-Class: sunw.demo.jhdemo.Runner Run-Class: sunw.demo.jhdemo.JHLauncher Added: trunk/freemind/debian/patches/series =================================================================== --- trunk/freemind/debian/patches/series (rev 0) +++ trunk/freemind/debian/patches/series 2010-05-08 15:34:34 UTC (rev 12359) @@ -0,0 +1,14 @@ +01_build_xml.patch +02_build_xml_jibx.patch +02_manifest.patch +03_freemind_sh.patch +10_plug_collab_jabber.patch +11_plug_collab_jabber_build.patch +20_plug_svg.patch +21_plug_svg_build.patch +30_plug_help.patch +31_plug_help_build.patch +32_plug_help_manifest.patch +40_plug_script.patch +41_plug_script_build.patch +50_plug_latex_off.patch Modified: trunk/freemind/debian/rules =================================================================== --- trunk/freemind/debian/rules 2010-05-08 14:34:28 UTC (rev 12358) +++ trunk/freemind/debian/rules 2010-05-08 15:34:34 UTC (rev 12359) @@ -5,7 +5,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk JAVA_HOME_DIRS := /usr/lib/jvm/java-6-openjdk Added: trunk/freemind/debian/source/format =================================================================== --- trunk/freemind/debian/source/format (rev 0) +++ trunk/freemind/debian/source/format 2010-05-08 15:34:34 UTC (rev 12359) @@ -0,0 +1 @@ +3.0 (quilt) _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
