Author: ewl-guest Date: 2011-02-26 12:07:13 +0000 (Sat, 26 Feb 2011) New Revision: 13360
Added: trunk/freemind/debian/freemind.bug-script trunk/freemind/debian/freemind.docs Modified: trunk/freemind/debian/changelog trunk/freemind/debian/control trunk/freemind/debian/copyright trunk/freemind/debian/patches/01_build_xml.patch trunk/freemind/debian/patches/02_build_xml_jibx.patch trunk/freemind/debian/patches/03_freemind_sh.patch trunk/freemind/debian/patches/05_freemind_sh_wrapper.patch trunk/freemind/debian/patches/11_plug_collab_jabber_build.patch trunk/freemind/debian/patches/21_plug_svg_build.patch trunk/freemind/debian/patches/31_plug_help_build.patch trunk/freemind/debian/patches/41_plug_script_build.patch trunk/freemind/debian/patches/50_plug_latex_off.patch trunk/freemind/debian/rules Log: New upstream release Removed libcommons-lang-java as (build) dependency. Added DEBUG_WRAPPER hook in freemind.sh. Added reportbug hook script to get more information from users. Bumped standard from 3.8.4.0 to 3.9.1.0 (had to include BSD license text into copyright file). Added upstream changelog 'history.txt' to freemind's docs. Modified: trunk/freemind/debian/changelog =================================================================== --- trunk/freemind/debian/changelog 2011-02-26 04:41:25 UTC (rev 13359) +++ trunk/freemind/debian/changelog 2011-02-26 12:07:13 UTC (rev 13360) @@ -1,8 +1,15 @@ -freemind (0.9.0~rc7+dfsg-2) UNRELEASED; urgency=low +freemind (0.9.0+dfsg-1) unstable; urgency=low + * New upstream release * Explicitly ask java-wrappers for java6 environment. + * Removed libcommons-lang-java as (build) dependency. + * Added DEBUG_WRAPPER hook in freemind.sh. + * Added reportbug hook script to get more information from users. + * Bumped standard from 3.8.4.0 to 3.9.1.0 (had to include BSD license text + into copyright file). + * Added upstream changelog 'history.txt' to freemind's docs. - -- Eric Lavarde <d...@zorglub.s.bawue.de> Sat, 08 May 2010 21:33:04 +0200 + -- Eric Lavarde <d...@zorglub.s.bawue.de> Sat, 26 Feb 2011 10:27:39 +0100 freemind (0.9.0~rc7+dfsg-1) unstable; urgency=low Modified: trunk/freemind/debian/control =================================================================== --- trunk/freemind/debian/control 2011-02-26 04:41:25 UTC (rev 13359) +++ trunk/freemind/debian/control 2011-02-26 12:07:13 UTC (rev 13360) @@ -4,15 +4,16 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> 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.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) +# run with the version it was built with. JiBX 1.1 has been chosen for +# compatibility with Ubuntu. +Build-Depends-Indep: docbook-to-man, ant1.7 | ant (<< 1.8), ant1.7-optional | ant-optional (<< 1.8), openjdk-6-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), quilt Homepage: http://freemind.sourceforge.net/ -Standards-Version: 3.8.4.0 +Standards-Version: 3.9.1.0 Package: freemind Architecture: all -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} +Depends: openjdk-6-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} 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}) Modified: trunk/freemind/debian/copyright =================================================================== --- trunk/freemind/debian/copyright 2011-02-26 04:41:25 UTC (rev 13359) +++ trunk/freemind/debian/copyright 2011-02-26 12:07:13 UTC (rev 13360) @@ -21,7 +21,7 @@ GNU General Public License for more details. A copy of the GNU General Public License is available as -/usr/share/common-licenses/GPL in the Debian GNU/Linux +/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution or on the World Wide Web at <http://www.gnu.org/copyleft/gpl.html>. You can also obtain it by writing to the Free Software Foundation, Inc., @@ -39,7 +39,7 @@ Files: ./freemind/controller/printpreview/*.java: Copyright: 2003 Jens Kaiser -License: LGPLv2+ (see above) +License: LGPLv2+ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public License @@ -51,7 +51,7 @@ * GNU Library General Public License for more details. A copy of the GNU Library General Public License is available as -/usr/share/common-licenses/LGPL in the Debian GNU/Linux +/usr/share/common-licenses/LGPL-2 in the Debian GNU/Linux distribution or on the World Wide Web at <http://www.gnu.org/copyleft/lgpl.html>. You can also obtain it by writing to the Free Software Foundation, Inc., @@ -193,10 +193,34 @@ License: BSD license without advertising clause. (see http://www.opensource.org/licenses/bsd-license.php for further details) -A copy of the BSD License is available as /usr/share/common-licenses/BSD -in the Debian GNU/Linux distribution. +Copyright (c) The Regents of the University of California. +All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + + Files: ./accessories/mm2html.xsl ./accessories/mm2latex*.xsl ./accessories/mm2text.xsl Author: joerg feuerhake joerg.feuerh...@free-penguin.org License: GPL (see above) Added: trunk/freemind/debian/freemind.bug-script =================================================================== --- trunk/freemind/debian/freemind.bug-script (rev 0) +++ trunk/freemind/debian/freemind.bug-script 2011-02-26 12:07:13 UTC (rev 13360) @@ -0,0 +1,2 @@ +#!/bin/sh +DEBUG=exit freemind 1>&3 2>&3 Added: trunk/freemind/debian/freemind.docs =================================================================== --- trunk/freemind/debian/freemind.docs (rev 0) +++ trunk/freemind/debian/freemind.docs 2011-02-26 12:07:13 UTC (rev 13360) @@ -0,0 +1 @@ +freemind/history.txt Modified: trunk/freemind/debian/patches/01_build_xml.patch =================================================================== --- trunk/freemind/debian/patches/01_build_xml.patch 2011-02-26 04:41:25 UTC (rev 13359) +++ trunk/freemind/debian/patches/01_build_xml.patch 2011-02-26 12:07:13 UTC (rev 13360) @@ -1,6 +1,5 @@ -diff -Nur -x '*.orig' -x '*~' freemind-0.9.0~rc5+cvs20090906/freemind/build.xml freemind-0.9.0~rc5+cvs20090906.new/freemind/build.xml ---- freemind-0.9.0~rc5+cvs20090906/freemind/build.xml 2009-07-17 21:17:41.000000000 +0200 -+++ freemind-0.9.0~rc5+cvs20090906.new/freemind/build.xml 2009-09-06 19:08:14.000000000 +0200 +--- a/freemind/build.xml ++++ b/freemind/build.xml @@ -33,15 +33,10 @@ <property name="java_source_version" value="1.4" /> <property name="java_target_version" value="1.4" /> @@ -13,20 +12,20 @@ - - - <!-- begin generator part --> -- <property name="jibxhome" value="lib/jibx"/> +- <property name="jibxhome" location="lib/jibx"/> + <property name="java.dir" value="/usr/share/java" /> + + <!-- begin generator part --> + <property name="jibxhome" value="${java.dir}"/> - <property name="jibxjar" value="lib/bindings.jar"/> + <property name="jibxjar" location="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}"/> @@ -49,7 +44,7 @@ <classpath path="${jibxlibs}"/> </taskdef> -- <property name="classpath" value="${jibxruntimelibs}:${jibxjar}:lib/commons-lang-2.0.jar:lib/forms-1.0.5.jar:lib/SimplyHTML/SimplyHTML.jar"/> -+ <property name="classpath" value="${jibxruntimelibs}:${jibxjar}:${java.dir}/commons-lang.jar:${java.dir}/forms.jar:${java.dir}/SimplyHTML.jar"/> +- <property name="classpath" value="${jibxruntimelibs}:${jibxjar}:lib/forms-1.0.5.jar:lib/SimplyHTML/SimplyHTML.jar"/> ++ <property name="classpath" value="${jibxruntimelibs}:${jibxjar}:${java.dir}/forms.jar:${java.dir}/SimplyHTML.jar"/> <target name="xmlbind.checkStatusOfGeneration"> <uptodate property="xmlbind.isUpToDate" @@ -42,11 +41,10 @@ <mkdir dir="${dist}/doc" /> <copy todir="${dist}/doc"> <fileset dir="${src}/doc/"> -@@ -194,15 +184,7 @@ +@@ -194,14 +184,7 @@ <mkdir dir="${dist.lib}" /> <copy todir="${dist.lib}"> <fileset dir="${src}/lib"> -- <include name="commons-lang-2.0.jar"/> - <include name="forms-1.0.5.jar"/> <include name="bindings.jar"/> - <include name="jibx/jibx-run.jar"/> @@ -58,7 +56,7 @@ </fileset> </copy> -@@ -212,15 +194,9 @@ +@@ -211,15 +194,9 @@ <condition property="isMacOs"> <os family="mac"/> </condition> @@ -74,7 +72,7 @@ <target name="dist_macos" if="isMacOs"> <delete dir="${dist_macos}"/> <mkdir dir="${dist_macos}"/> -@@ -497,7 +473,7 @@ +@@ -513,7 +490,7 @@ <target name="val"> <xmlvalidate lenient="false" failonerror="no" warn="true" classname="org.apache.xerces.parsers.SAXParser" Modified: trunk/freemind/debian/patches/02_build_xml_jibx.patch =================================================================== --- trunk/freemind/debian/patches/02_build_xml_jibx.patch 2011-02-26 04:41:25 UTC (rev 13359) +++ trunk/freemind/debian/patches/02_build_xml_jibx.patch 2011-02-26 12:07:13 UTC (rev 13360) @@ -3,7 +3,7 @@ @@ -38,8 +38,8 @@ <!-- begin generator part --> <property name="jibxhome" value="${java.dir}"/> - <property name="jibxjar" value="lib/bindings.jar"/> + <property name="jibxjar" location="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"/> @@ -11,4 +11,3 @@ <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 2011-02-26 04:41:25 UTC (rev 13359) +++ trunk/freemind/debian/patches/03_freemind_sh.patch 2011-02-26 12:07:13 UTC (rev 13360) @@ -6,11 +6,9 @@ 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() { +@@ -94,7 +94,8 @@ return 0 else _error "Couldn't find a java virtual machine," \ @@ -20,7 +18,7 @@ return 1 fi } -@@ -196,11 +197,13 @@ 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:\ @@ -33,9 +31,7 @@ ${freedir}/lib/bindings.jar:\ -${freedir}/lib/commons-lang-2.0.jar:\ -${freedir}/lib/forms-1.0.5.jar:\ -+/usr/share/java/commons-lang.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 2011-02-26 04:41:25 UTC (rev 13359) +++ trunk/freemind/debian/patches/05_freemind_sh_wrapper.patch 2011-02-26 12:07:13 UTC (rev 13360) @@ -1,7 +1,23 @@ ---- 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 @@ +Index: freemind-0.9.0+dfsg/freemind/freemind.sh +=================================================================== +--- 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 @@ + set -x + fi ++# debug also java-wrapper ++if [ -n "${DEBUG}" ] ++then ++ DEBUG_WRAPPER=1 ++ export DEBUG_WRAPPER ++fi ++ + ########## FUNCTIONS DEFINITIONS ####################################### + + _debug() { +@@ -47,45 +54,45 @@ + findjava() { # We try hard to find the proper 'java' command - if [ -n "${JAVACMD}" ] && [ -x "${JAVACMD}" ] @@ -58,7 +74,7 @@ "to point to such a VM. See the manpage of freemind(1) for details." JAVA_TYPE=other else -@@ -94,7 +94,7 @@ +@@ -94,7 +101,7 @@ return 0 else _error "Couldn't find a java virtual machine," \ @@ -67,7 +83,7 @@ "See the manpage of freemind(1) for details." return 1 fi -@@ -141,10 +141,16 @@ +@@ -141,10 +148,16 @@ _source /etc/freemind/freemindrc _source ~/.freemind/freemindrc @@ -88,7 +104,7 @@ fi output_debug_info -@@ -207,11 +213,11 @@ +@@ -206,11 +219,11 @@ ${freedir}" if [ "${JAVA_TYPE}" = "sun" ] then Modified: trunk/freemind/debian/patches/11_plug_collab_jabber_build.patch =================================================================== --- trunk/freemind/debian/patches/11_plug_collab_jabber_build.patch 2011-02-26 04:41:25 UTC (rev 13359) +++ trunk/freemind/debian/patches/11_plug_collab_jabber_build.patch 2011-02-26 12:07:13 UTC (rev 13360) @@ -1,10 +1,10 @@ ---- f/freemind/plugins/build_jabber.xml -+++ f/freemind/plugins/build_jabber.xml -@@ -4,10 +4,10 @@ - <property name="plugin.dir" value="plugins/collaboration/jabber"/> +--- a/freemind/plugins/build_jabber.xml ++++ b/freemind/plugins/build_jabber.xml +@@ -5,10 +5,10 @@ + <property name="local.plugin.dir" location="${src}/plugins/collaboration/jabber"/> <property name="plugin.jar" value="jabber_plugin.jar" /> <property name="plugin.zip" value="jabber_plugin-${ver}.zip" /> -- <property name="additional.lib" value="${plugin.dir}/commons-logging.jar:${plugin.dir}/crimson-1.1.3.jar:${plugin.dir}/jakarta-oro.jar:${plugin.dir}/jaxp-1.1.jar:${plugin.dir}/jdom.jar:${plugin.dir}/log4j.jar:${plugin.dir}/muse.jar:${plugin.dir}/jabber_plugin.jar"/> +- <property name="additional.lib" value="${local.plugin.dir}/commons-logging.jar:${local.plugin.dir}/crimson-1.1.3.jar:${local.plugin.dir}/jakarta-oro.jar:${local.plugin.dir}/jaxp-1.1.jar:${local.plugin.dir}/jdom.jar:${local.plugin.dir}/log4j.jar:${local.plugin.dir}/muse.jar:${local.plugin.dir}/jabber_plugin.jar"/> + <property name="additional.lib" value="/usr/share/java/commons-logging.jar:/usr/share/java/crimson.jar:/usr/share/java/oro.jar:/usr/share/java/gnujaxp.jar:/usr/share/java/jdom0.jar:/usr/share/java/log4j-1.2.jar:${plugin.dir}/muse.jar:${plugin.dir}/jabber_plugin.jar"/> <property name="additional.lib.pattern" value="${plugin.dir}/*.jar"/> Modified: trunk/freemind/debian/patches/21_plug_svg_build.patch =================================================================== --- trunk/freemind/debian/patches/21_plug_svg_build.patch 2011-02-26 04:41:25 UTC (rev 13359) +++ trunk/freemind/debian/patches/21_plug_svg_build.patch 2011-02-26 12:07:13 UTC (rev 13360) @@ -1,14 +1,12 @@ -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 @@ +--- a/freemind/plugins/build_svg.xml ++++ b/freemind/plugins/build_svg.xml +@@ -7,9 +7,8 @@ <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"/> --> -- <property name="additional.lib" value="${plugin.dir}/batik-awt-util.jar:${plugin.dir}/batik-bridge.jar:${plugin.dir}/batik-css.jar:${plugin.dir}/batik-dom.jar:${plugin.dir}/batik-extension.jar:${plugin.dir}/batik-ext.jar:${plugin.dir}/batik-gui-util.jar:${plugin.dir}/batik-gvt.jar:${plugin.dir}/batik-parser.jar:${plugin.dir}/batik-script.jar:${plugin.dir}/batik-svg-dom.jar:${plugin.dir}/batik-svggen.jar:${plugin.dir}/batik-swing.jar:${plugin.dir}/batik-transcoder.jar:${plugin.dir}/batik-util.jar:${plugin.dir}/batik-xml.jar:${plugin.dir}/js.jar:${plugin.dir}/pdf-transcoder.jar:${plugin.dir}/xerces_2_5_0.jar:${plugin.dir}/xml-apis.jar:${plugin.dir}/batik-squiggle.jar"/> +- <property name="additional.lib" value="${local.plugin.dir}/batik-awt-util.jar:${local.plugin.dir}/batik-bridge.jar:${local.plugin.dir}/batik-css.jar:${local.plugin.dir}/batik-dom.jar:${local.plugin.dir}/batik-extension.jar:${local.plugin.dir}/batik-ext.jar:${local.plugin.dir}/batik-gui-util.jar:${local.plugin.dir}/batik-gvt.jar:${local.plugin.dir}/batik-parser.jar:${local.plugin.dir}/batik-script.jar:${local.plugin.dir}/batik-svg-dom.jar:${local.plugin.dir}/batik-svggen.jar:${local.plugin.dir}/batik-swing.jar:${local.plugin.dir}/batik-transcoder.jar:${local.plugin.dir}/batik-util.jar:${local.plugin.dir}/batik-xml.jar:${local.plugin.dir}/js.jar:${local.plugin.dir}/pdf-transcoder.jar:${local.plugin.dir}/xerces_2_5_0.jar:${local.plugin.dir}/xml-apis.jar:${local.plugin.dir}/batik-squiggle.jar"/> +- + <property name="additional.lib" value="/usr/share/java/batik-all.jar:/usr/share/java/js.jar:/usr/share/java/fop.jar:/usr/share/java/xercesImpl.jar:/usr/share/java/xmlParserAPIs.jar:/usr/share/java/avalon-framework.jar:/usr/share/java/xmlgraphics-commons.jar"/> - <property name="additional.lib.pattern" value="${plugin.dir}/*.jar"/> <import file="build_import.xml" /> Modified: trunk/freemind/debian/patches/31_plug_help_build.patch =================================================================== --- trunk/freemind/debian/patches/31_plug_help_build.patch 2011-02-26 04:41:25 UTC (rev 13359) +++ trunk/freemind/debian/patches/31_plug_help_build.patch 2011-02-26 12:07:13 UTC (rev 13360) @@ -1,11 +1,10 @@ -diff -Nur -x '*.orig' -x '*~' freemind-0.9.0~rc1/freemind/plugins/build_help.xml freemind-0.9.0~rc1.new/freemind/plugins/build_help.xml ---- freemind-0.9.0~rc1/freemind/plugins/build_help.xml 2004-11-16 17:42:37.000000000 +0100 -+++ freemind-0.9.0~rc1.new/freemind/plugins/build_help.xml 2009-03-04 21:16:03.000000000 +0100 -@@ -4,10 +4,10 @@ - <property name="plugin.dir" value="plugins/help"/> +--- a/freemind/plugins/build_help.xml ++++ b/freemind/plugins/build_help.xml +@@ -5,10 +5,10 @@ + <property name="local.plugin.dir" location="${src}/${plugin.dir}"/> <property name="plugin.jar" value="help_plugin.jar" /> <property name="plugin.zip" value="help_plugin-${ver}.zip" /> -- <property name="additional.lib" value="${plugin.dir}/jhall.jar"/> +- <property name="additional.lib" value="${local.plugin.dir}/jhall.jar"/> - <property name="additional.lib.pattern" value="${plugin.dir}/jhall.jar"/> + <property name="additional.lib" value="/usr/share/java/jhall.jar"/> + <property name="additional.lib.pattern" value="/usr/share/java/jhall.jar"/> Modified: trunk/freemind/debian/patches/41_plug_script_build.patch =================================================================== --- trunk/freemind/debian/patches/41_plug_script_build.patch 2011-02-26 04:41:25 UTC (rev 13359) +++ trunk/freemind/debian/patches/41_plug_script_build.patch 2011-02-26 12:07:13 UTC (rev 13360) @@ -1,11 +1,10 @@ -diff -Nur -x '*.orig' -x '*~' freemind-0.9.0~rc1/freemind/plugins/build_scripting.xml freemind-0.9.0~rc1.new/freemind/plugins/build_scripting.xml ---- freemind-0.9.0~rc1/freemind/plugins/build_scripting.xml 2008-07-18 21:02:53.000000000 +0200 -+++ freemind-0.9.0~rc1.new/freemind/plugins/build_scripting.xml 2009-02-25 20:16:07.000000000 +0100 -@@ -4,9 +4,9 @@ - <property name="plugin.dir" value="plugins/script"/> +--- a/freemind/plugins/build_scripting.xml ++++ b/freemind/plugins/build_scripting.xml +@@ -5,9 +5,9 @@ + <property name="local.plugin.dir" location="${src}/plugins/script"/> <property name="plugin.jar" value="scripting_plugin.jar" /> <property name="plugin.zip" value="scripting_plugin-${ver}.zip" /> -- <property name="additional.lib" value="${plugin.dir}/groovy-all-1.5.6.jar"/> +- <property name="additional.lib" location="${local.plugin.dir}/groovy-all-1.5.6.jar"/> + <property name="additional.lib" value="/usr/share/java/groovy.jar"/> <property name="additional.lib.pattern" value="${plugin.dir}/*.jar"/> Modified: trunk/freemind/debian/patches/50_plug_latex_off.patch =================================================================== --- trunk/freemind/debian/patches/50_plug_latex_off.patch 2011-02-26 04:41:25 UTC (rev 13359) +++ trunk/freemind/debian/patches/50_plug_latex_off.patch 2011-02-26 12:07:13 UTC (rev 13360) @@ -1,7 +1,6 @@ -diff -Nur -x '*.orig' -x '*~' freemind-0.9.0~rc4/freemind/plugins/build.xml freemind-0.9.0~rc4.new/freemind/plugins/build.xml ---- freemind-0.9.0~rc4/freemind/plugins/build.xml 2009-02-16 22:27:17.000000000 +0100 -+++ freemind-0.9.0~rc4.new/freemind/plugins/build.xml 2009-05-24 09:22:11.000000000 +0200 -@@ -12,6 +12,7 @@ +--- a/freemind/plugins/build.xml ++++ b/freemind/plugins/build.xml +@@ -24,6 +24,7 @@ <exclude name="build_jabber.xml"/> <!-- This collaboration module is for post 0.9.0. --> <exclude name="build_database.xml"/> @@ -9,7 +8,7 @@ </fileset> </subant> </sequential> -@@ -29,4 +30,4 @@ +@@ -41,4 +42,4 @@ <callant task="post"/> </target> Modified: trunk/freemind/debian/rules =================================================================== --- trunk/freemind/debian/rules 2011-02-26 04:41:25 UTC (rev 13359) +++ trunk/freemind/debian/rules 2011-02-26 12:07:13 UTC (rev 13360) @@ -5,6 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk +include /usr/share/quilt/quilt.make JAVA_HOME_DIRS := /usr/lib/jvm/java-6-openjdk _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
