[pkg-java] r12745 - in trunk/freeplane: . debian debian/patches debian/source
Eric Lavarde
ewl-guest at alioth.debian.org
Mon Jul 12 17:01:57 UTC 2010
Author: ewl-guest
Date: 2010-07-12 17:01:55 +0000 (Mon, 12 Jul 2010)
New Revision: 12745
Added:
trunk/freeplane/debian/
trunk/freeplane/debian/README.Debian
trunk/freeplane/debian/README.source
trunk/freeplane/debian/ant.properties
trunk/freeplane/debian/changelog
trunk/freeplane/debian/compat
trunk/freeplane/debian/control
trunk/freeplane/debian/copyright
trunk/freeplane/debian/freeplane.dirs
trunk/freeplane/debian/freeplane.docs
trunk/freeplane/debian/freeplane.install
trunk/freeplane/debian/freeplane.links
trunk/freeplane/debian/freeplane.manpages
trunk/freeplane/debian/freeplane.menu
trunk/freeplane/debian/freeplane.sgml
trunk/freeplane/debian/libjortho-freeplane-java.install
trunk/freeplane/debian/libjortho-freeplane-java.links
trunk/freeplane/debian/patches/
trunk/freeplane/debian/patches/10_libraries_properties.patch
trunk/freeplane/debian/patches/15_libraries_manifest.patch
trunk/freeplane/debian/patches/40_no_winmac.patch
trunk/freeplane/debian/patches/50_no_copy_files.patch
trunk/freeplane/debian/patches/series
trunk/freeplane/debian/rules
trunk/freeplane/debian/source/
trunk/freeplane/debian/source/format
trunk/freeplane/debian/watch
Log:
[svn-inject] Applying Debian modifications (1.1.1-1) to trunk
Property changes on: trunk/freeplane/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: trunk/freeplane/debian/README.Debian
===================================================================
--- trunk/freeplane/debian/README.Debian (rev 0)
+++ trunk/freeplane/debian/README.Debian 2010-07-12 17:01:55 UTC (rev 12745)
@@ -0,0 +1,7 @@
+freeplane for Debian
+--------------------
+
+Without installing the recommended xdg-utils, Freeplane won't be able to open
+links as it's using xdg-open to do so, and it will fail SILENTLY!
+
+ -- Eric Lavarde <deb at zorglub.s.bawue.de> Sat, 23 Jan 2010 10:47:53 +0100
Added: trunk/freeplane/debian/README.source
===================================================================
--- trunk/freeplane/debian/README.source (rev 0)
+++ trunk/freeplane/debian/README.source 2010-07-12 17:01:55 UTC (rev 12745)
@@ -0,0 +1,9 @@
+freeplane for Debian
+--------------------
+
+<this file describes information about the source package, see Debian policy
+manual section 4.14. You WILL either need to modify or delete this file>
+
+
+
+
Added: trunk/freeplane/debian/ant.properties
===================================================================
--- trunk/freeplane/debian/ant.properties (rev 0)
+++ trunk/freeplane/debian/ant.properties 2010-07-12 17:01:55 UTC (rev 12745)
@@ -0,0 +1 @@
+skip_bugreport=true
Added: trunk/freeplane/debian/changelog
===================================================================
--- trunk/freeplane/debian/changelog (rev 0)
+++ trunk/freeplane/debian/changelog 2010-07-12 17:01:55 UTC (rev 12745)
@@ -0,0 +1,24 @@
+freeplane (1.1.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Eric Lavarde <deb at zorglub.s.bawue.de> Sun, 04 Jul 2010 20:49:07 +0200
+
+freeplane (1.1.0-1) unstable; urgency=low
+
+ * New upstream release (stable version).
+ * Move to quilt source format.
+
+ -- Eric Lavarde <deb at zorglub.s.bawue.de> Sat, 03 Jul 2010 14:12:19 +0200
+
+freeplane (1.0.45-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Eric Lavarde <deb at zorglub.s.bawue.de> Thu, 10 Jun 2010 21:55:32 +0200
+
+freeplane (1.0.38-1) unstable; urgency=low
+
+ * Initial release (Closes: #566375).
+
+ -- Eric Lavarde <deb at zorglub.s.bawue.de> Sat, 23 Jan 2010 10:47:53 +0100
Added: trunk/freeplane/debian/compat
===================================================================
--- trunk/freeplane/debian/compat (rev 0)
+++ trunk/freeplane/debian/compat 2010-07-12 17:01:55 UTC (rev 12745)
@@ -0,0 +1 @@
+7
Added: trunk/freeplane/debian/control
===================================================================
--- trunk/freeplane/debian/control (rev 0)
+++ trunk/freeplane/debian/control 2010-07-12 17:01:55 UTC (rev 12745)
@@ -0,0 +1,40 @@
+Source: freeplane
+Section: editors
+Priority: extra
+Maintainer: 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.8.3
+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
+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/.
Added: trunk/freeplane/debian/copyright
===================================================================
--- trunk/freeplane/debian/copyright (rev 0)
+++ trunk/freeplane/debian/copyright 2010-07-12 17:01:55 UTC (rev 12745)
@@ -0,0 +1,49 @@
+This work was packaged for Debian by:
+
+ Eric Lavarde <deb at zorglub.s.bawue.de> on Sat, 23 Jan 2010 10:47:53 +0100
+
+It was downloaded from <http://freeplane.org/>
+
+Upstream Author(s):
+
+ Dimitri Polivaev <dpolivaev at gmx.de>
+
+Copyright:
+
+ Copyright (C) 2008 Joerg Mueller, Daniel Polansky, Christian Foltin, Dimitry Polivaev
+ (and many others)
+
+License:
+
+ GNU Public License version 2 or later (for most parts, see below),
+ see `/usr/share/common-licenses/GPL-2'.
+
+The Debian packaging is:
+
+ Copyright (C) 2010 Eric Lavarde <deb at zorglub.s.bawue.de>
+
+and is licensed under the same version as the overwhelming majority of the
+software itself, i.e. GPLv2 or later.
+see `/usr/share/common-licenses/GPL-2'.
+
+# Files with different license and/or copyright:
+
+Files: ./freeplane/src/org/freeplane/n3/nanoxml/*
+ This file is part of NanoXML 2 for Java.
+ Copyright (C) 2000-2002 Marc De Scheemaecker, All Rights Reserved. This
+ software is provided 'as-is', without any express or implied warranty. In no
+ event will the authors be held liable for any damages arising from the use of
+ this software. Permission is granted to anyone to use this software for any
+ purpose, including commercial applications, and to alter it and redistribute
+ it freely, subject to the following restrictions: 1. The origin of this
+ software must not be misrepresented; you must not claim that you wrote the
+ original software. If you use this software in a product, an acknowledgment
+ in the product documentation would be appreciated but is not required. 2.
+ Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software. 3. This notice may not be
+ removed or altered from any source distribution.
+
+Files: ./JOrtho_0.4_freeplane/src/com/inet/jortho/*
+ Copyright (C) 2005-2008 by i-net software
+ GNU Public License version 2 or later,
+ see `/usr/share/common-licenses/GPL-2'.
Added: trunk/freeplane/debian/freeplane.dirs
===================================================================
--- trunk/freeplane/debian/freeplane.dirs (rev 0)
+++ trunk/freeplane/debian/freeplane.dirs 2010-07-12 17:01:55 UTC (rev 12745)
@@ -0,0 +1 @@
+usr/share/freeplane
Added: trunk/freeplane/debian/freeplane.docs
===================================================================
--- trunk/freeplane/debian/freeplane.docs (rev 0)
+++ trunk/freeplane/debian/freeplane.docs 2010-07-12 17:01:55 UTC (rev 12745)
@@ -0,0 +1 @@
+freeplane/doc/history_en.txt
Added: trunk/freeplane/debian/freeplane.install
===================================================================
--- trunk/freeplane/debian/freeplane.install (rev 0)
+++ trunk/freeplane/debian/freeplane.install 2010-07-12 17:01:55 UTC (rev 12745)
@@ -0,0 +1,2 @@
+freeplane_framework/build/* usr/share/freeplane
+freeplane.xpm /usr/share/pixmaps
Added: trunk/freeplane/debian/freeplane.links
===================================================================
--- trunk/freeplane/debian/freeplane.links (rev 0)
+++ trunk/freeplane/debian/freeplane.links 2010-07-12 17:01:55 UTC (rev 12745)
@@ -0,0 +1,2 @@
+usr/share/freeplane/freeplane.sh usr/bin/freeplane
+usr/share/knopflerfish/framework.jar usr/share/freeplane/framework.jar
Added: trunk/freeplane/debian/freeplane.manpages
===================================================================
--- trunk/freeplane/debian/freeplane.manpages (rev 0)
+++ trunk/freeplane/debian/freeplane.manpages 2010-07-12 17:01:55 UTC (rev 12745)
@@ -0,0 +1 @@
+freeplane.1
Added: trunk/freeplane/debian/freeplane.menu
===================================================================
--- trunk/freeplane/debian/freeplane.menu (rev 0)
+++ trunk/freeplane/debian/freeplane.menu 2010-07-12 17:01:55 UTC (rev 12745)
@@ -0,0 +1,2 @@
+?package(freeplane):needs="X11" section="Applications/Office" hints="Mind map" \
+ title="Freeplane" command="/usr/bin/freeplane" icon="freeplane.xpm"
Added: trunk/freeplane/debian/freeplane.sgml
===================================================================
--- trunk/freeplane/debian/freeplane.sgml (rev 0)
+++ trunk/freeplane/debian/freeplane.sgml 2010-07-12 17:01:55 UTC (rev 12745)
@@ -0,0 +1,154 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+ page: `docbook-to-man manpage.sgml > manpage.1'. You may view
+ the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+ less'. A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+ docbook-to-man $< > $@
+
+
+ The docbook-to-man binary is found in the docbook-to-man package.
+ Please remember that if you create the nroff version in one of the
+ debian/rules file targets (such as build), you will need to include
+ docbook-to-man in your Build-Depends control field.
+
+ -->
+
+ <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+ <!ENTITY dhfirstname "<firstname>Eric</firstname>">
+ <!ENTITY dhsurname "<surname>Lavarde</surname>">
+ <!-- Please adjust the date whenever revising the manpage. -->
+ <!ENTITY dhdate "<date>January 23, 2010</date>">
+ <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+ allowed: see man(7), man(1). -->
+ <!ENTITY dhsection "<manvolnum>1</manvolnum>">
+ <!ENTITY dhemail "<email>deb at zorglub.s.bawue.de</email>">
+ <!ENTITY dhusername "Eric Lavarde">
+ <!ENTITY dhucpackage "<refentrytitle>FREEPLANE</refentrytitle>">
+ <!ENTITY dhpackage "freeplane">
+
+ <!ENTITY debian "<productname>Debian</productname>">
+ <!ENTITY gnu "<acronym>GNU</acronym>">
+ <!ENTITY gpl "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+ <refentryinfo>
+ <address>
+ &dhemail;
+ </address>
+ <author>
+ &dhfirstname;
+ &dhsurname;
+ </author>
+ <copyright>
+ <year>2003</year>
+ <holder>&dhusername;</holder>
+ </copyright>
+ &dhdate;
+ </refentryinfo>
+ <refmeta>
+ &dhucpackage;
+
+ &dhsection;
+ </refmeta>
+ <refnamediv>
+ <refname>&dhpackage;</refname>
+
+ <refpurpose>program to do something</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>&dhpackage;</command>
+
+ <arg><option>-e <replaceable>this</replaceable></option></arg>
+
+ <arg><option>--example <replaceable>that</replaceable></option></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+ <refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This manual page documents briefly the
+ <command>&dhpackage;</command> command.</para>
+
+ <para>This manual page was written for the &debian; distribution
+ because the original program does not have a manual page.
+ Instead, it has documentation in the
+ <application>Help</application> menu.</para>
+
+ <para><command>&dhpackage;</command> is a program that allows
+ you to create mind maps.</para>
+
+ </refsect1>
+ <refsect1>
+ <title>OPTIONS</title>
+
+ <para>These programs follow the usual &gnu; command line syntax,
+ with long options starting with two dashes (`-'). A summary of
+ options is included below. For a complete description, see the
+ <application>Info</application> files.</para>
+
+ <variablelist>
+ <varlistentry>
+ <term><option>-h</option>
+ <option>--help</option>
+ </term>
+ <listitem>
+ <para>Show summary of options.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-v</option>
+ <option>--version</option>
+ </term>
+ <listitem>
+ <para>Show version of program.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+ <refsect1>
+ <title>SEE ALSO</title>
+
+ <para>bar (1), baz (1).</para>
+
+ <para>The programs are documented fully by <citetitle>The Rise and
+ Fall of a Fooish Bar</citetitle> available via the
+ <application>Info</application> system.</para>
+ </refsect1>
+ <refsect1>
+ <title>AUTHOR</title>
+
+ <para>This manual page was written by &dhusername; &dhemail; for
+ the &debian; system (and may be used by others). Permission is
+ granted to copy, distribute and/or modify this document under
+ the terms of the &gnu; General Public License, Version 2 any
+ later version published by the Free Software Foundation.
+ </para>
+ <para>
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in /usr/share/common-licenses/GPL.
+ </para>
+
+ </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
Added: trunk/freeplane/debian/libjortho-freeplane-java.install
===================================================================
--- trunk/freeplane/debian/libjortho-freeplane-java.install (rev 0)
+++ trunk/freeplane/debian/libjortho-freeplane-java.install 2010-07-12 17:01:55 UTC (rev 12745)
@@ -0,0 +1 @@
+JOrtho_0.4_freeplane/dist/lib/jortho-0.4+fp1.1.1.jar usr/share/java
Added: trunk/freeplane/debian/libjortho-freeplane-java.links
===================================================================
--- trunk/freeplane/debian/libjortho-freeplane-java.links (rev 0)
+++ trunk/freeplane/debian/libjortho-freeplane-java.links 2010-07-12 17:01:55 UTC (rev 12745)
@@ -0,0 +1 @@
+usr/share/java/jortho-0.4+fp1.1.1.jar usr/share/java/jortho.jar
Added: trunk/freeplane/debian/patches/10_libraries_properties.patch
===================================================================
--- trunk/freeplane/debian/patches/10_libraries_properties.patch (rev 0)
+++ trunk/freeplane/debian/patches/10_libraries_properties.patch 2010-07-12 17:01:55 UTC (rev 12745)
@@ -0,0 +1,81 @@
+diff -Nur -x '*.orig' -x '*~' freeplane-1.0.38/freeplane/ant/ant.properties freeplane-1.0.38.new/freeplane/ant/ant.properties
+--- freeplane-1.0.38/freeplane/ant/ant.properties 2009-12-13 23:28:47.000000000 +0100
++++ freeplane-1.0.38.new/freeplane/ant/ant.properties 2010-01-23 12:11:58.000000000 +0100
+@@ -1,11 +1,11 @@
+-freeplane.ext.lib = ${workspace}/freeplane/lib
++freeplane.ext.lib = /usr/share/java
+ freeplane.dist.lib = ${workspace}/freeplane/dist/lib
+ freeplaneviewer.jar = ${freeplane.dist.lib}/freeplaneviewer.jar
+ freeplaneeditor.jar = ${freeplane.dist.lib}/freeplaneeditor.jar
+ freeplaneosgi.jar = ${freeplane.dist.lib}/freeplaneosgi.jar
+ freeplanemac.jar = ${freeplane.ext.lib}/freeplanemac.jar
+ freeplane.jars = ${freeplaneviewer.jar}:${freeplaneeditor.jar}:${freeplaneosgi.jar}:${freeplanemac.jar}
+-commons-lang.jar = ${freeplane.ext.lib}/commons-lang-2.0.jar
+-forms.jar = ${freeplane.ext.lib}/forms-1.0.5.jar
++commons-lang.jar = ${freeplane.ext.lib}/commons-lang.jar
++forms.jar = ${freeplane.ext.lib}/forms.jar
+ SimplyHTML.jar = ${freeplane.ext.lib}/SimplyHTML.jar
+-jortho.jar = ${freeplane.ext.lib}/jortho.jar
++jortho.jar = ${workspace}/JOrtho_0.4_freeplane/dist/lib/jortho-0.4+fp1.1.1.jar
+diff -Nur -x '*.orig' -x '*~' freeplane-1.0.38/freeplane_framework/ant/ant.properties freeplane-1.0.38.new/freeplane_framework/ant/ant.properties
+--- freeplane-1.0.38/freeplane_framework/ant/ant.properties 2009-12-13 23:28:47.000000000 +0100
++++ freeplane-1.0.38.new/freeplane_framework/ant/ant.properties 2010-01-23 12:11:58.000000000 +0100
+@@ -1,1 +1,1 @@
+-framework.ext.lib = ${workspace}/freeplane_framework/lib
++framework.ext.lib = /usr/share
+diff -Nur -x '*.orig' -x '*~' freeplane-1.0.38/freeplane_plugin_bugreport/ant/ant.properties freeplane-1.0.38.new/freeplane_plugin_bugreport/ant/ant.properties
+--- freeplane-1.0.38/freeplane_plugin_bugreport/ant/ant.properties 2009-12-13 23:28:47.000000000 +0100
++++ freeplane-1.0.38.new/freeplane_plugin_bugreport/ant/ant.properties 2010-01-23 12:11:58.000000000 +0100
+@@ -1 +1 @@
+-plugin.ext.lib = lib
++plugin.ext.lib = /usr/share/java
+diff -Nur -x '*.orig' -x '*~' freeplane-1.0.38/freeplane_plugin_help/ant/ant.properties freeplane-1.0.38.new/freeplane_plugin_help/ant/ant.properties
+--- freeplane-1.0.38/freeplane_plugin_help/ant/ant.properties 2009-12-13 23:28:47.000000000 +0100
++++ freeplane-1.0.38.new/freeplane_plugin_help/ant/ant.properties 2010-01-23 12:11:58.000000000 +0100
+@@ -1,2 +1,2 @@
+-plugin.ext.lib = lib
++plugin.ext.lib = /usr/share/java
+ jhall.jar = ${plugin.ext.lib}/jhall.jar
+diff -Nur -x '*.orig' -x '*~' freeplane-1.0.38/freeplane_plugin_latex/ant/ant.properties freeplane-1.0.38.new/freeplane_plugin_latex/ant/ant.properties
+--- freeplane-1.0.38/freeplane_plugin_latex/ant/ant.properties 2010-01-07 08:55:57.000000000 +0100
++++ freeplane-1.0.38.new/freeplane_plugin_latex/ant/ant.properties 2010-01-23 12:12:30.000000000 +0100
+@@ -1,2 +1,2 @@
+-plugin.ext.lib = lib
++plugin.ext.lib = /usr/share/java
+ jlatexmath.jar = ${plugin.ext.lib}/jlatexmath.jar
+diff -Nur -x '*.orig' -x '*~' freeplane-1.0.38/freeplane_plugin_script/ant/ant.properties freeplane-1.0.38.new/freeplane_plugin_script/ant/ant.properties
+--- freeplane-1.0.38/freeplane_plugin_script/ant/ant.properties 2009-12-13 23:28:47.000000000 +0100
++++ freeplane-1.0.38.new/freeplane_plugin_script/ant/ant.properties 2010-01-23 12:11:58.000000000 +0100
+@@ -1,2 +1,2 @@
+-plugin.ext.lib = lib
+-groovy.jar = ${plugin.ext.lib}/groovy-all-1.5.6.jar
++plugin.ext.lib = /usr/share/java
++groovy.jar = ${plugin.ext.lib}/groovy-all.jar
+diff -Nur -x '*.orig' -x '*~' freeplane-1.0.38/freeplane_plugin_svg/ant/ant.properties freeplane-1.0.38.new/freeplane_plugin_svg/ant/ant.properties
+--- freeplane-1.0.38/freeplane_plugin_svg/ant/ant.properties 2009-12-13 23:28:48.000000000 +0100
++++ freeplane-1.0.38.new/freeplane_plugin_svg/ant/ant.properties 2010-01-23 12:11:58.000000000 +0100
+@@ -1,12 +1,12 @@
+-plugin.ext.lib = lib
++plugin.ext.lib = /usr/share/java
+
+ # Batik - xml.apache.org SVG Library (batik-all.jar)
+-batik.jars = ${plugin.ext.lib}/batik-awt-util.jar:${plugin.ext.lib}/batik-bridge.jar:${plugin.ext.lib}/batik-css.jar:${plugin.ext.lib}/batik-dom.jar:${plugin.ext.lib}/batik-extension.jar:${plugin.ext.lib}/batik-ext.jar:${plugin.ext.lib}/batik-codec.jar:${plugin.ext.lib}/batik-anim.jar:${plugin.ext.lib}/batik-gui-util.jar:${plugin.ext.lib}/batik-gvt.jar:${plugin.ext.lib}/batik-parser.jar:${plugin.ext.lib}/batik-script.jar:${plugin.ext.lib}/batik-svg-dom.jar:${plugin.ext.lib}/batik-svggen.jar:${plugin.ext.lib}/batik-swing.jar:${plugin.ext.lib}/batik-transcoder.jar:${plugin.ext.lib}/batik-util.jar:${plugin.ext.lib}/batik-xml.jar
++batik.jars = ${plugin.ext.lib}/batik-all.jar
+
+ # Rhino - JavaScript engine written in Java
+ js.jar = ${plugin.ext.lib}/js.jar
+ # FOP - XML to PDF Translator (fop.jar)
+-pdf-transcoder.jar = ${plugin.ext.lib}/pdf-transcoder.jar
++pdf-transcoder.jar = ${plugin.ext.lib}/fop.jar
+
+ pdf.jars = ${pdf-transcoder.jar}
+ # Possibly also needed to work properly under Debian/Ubuntu:
+@@ -17,7 +17,7 @@
+
+ # Xerces2 - Validating XML parser for Java with DOM level 3 support
+ # (xercesImpl.jar and xmlParserAPIs.jar)
+-xerces.jar = ${plugin.ext.lib}/xerces_2_5_0.jar
++xerces.jar = ${plugin.ext.lib}/xercesImpl.jar
+ xml-apis-ext.jar = ${plugin.ext.lib}/xml-apis-ext.jar
+ # Xalan2 - XSL Transformations (XSLT) processor in Java
+ xml-apis.jar = ${plugin.ext.lib}/xml-apis.jar
Added: trunk/freeplane/debian/patches/15_libraries_manifest.patch
===================================================================
--- trunk/freeplane/debian/patches/15_libraries_manifest.patch (rev 0)
+++ trunk/freeplane/debian/patches/15_libraries_manifest.patch 2010-07-12 17:01:55 UTC (rev 12745)
@@ -0,0 +1,87 @@
+diff -Nur -x '*.orig' -x '*~' freeplane-1.1.0//freeplane/META-INF/MANIFEST.MF freeplane-1.1.0.new//freeplane/META-INF/MANIFEST.MF
+--- freeplane-1.1.0//freeplane/META-INF/MANIFEST.MF 2010-02-21 19:20:33.000000000 +0100
++++ freeplane-1.1.0.new//freeplane/META-INF/MANIFEST.MF 2010-07-03 14:38:53.000000000 +0200
+@@ -7,11 +7,11 @@
+ lib/freeplaneeditor.jar,
+ lib/freeplanemac.jar,
+ lib/freeplaneosgi.jar,
+- lib/commons-lang-2.0.jar,
+- lib/forms-1.0.5.jar,
+- lib/gnu-regexp-1.1.4.jar,
+- lib/SimplyHTML.jar,
+- lib/jortho.jar
++ ../../../java/commons-lang.jar,
++ ../../../java/forms.jar,
++ ../../../java/gnu-regexp-1.1.4.jar,
++ ../../../java/SimplyHTML.jar,
++ ../../../java/jortho.jar
+ Bundle-Activator: org.freeplane.main.osgi.Activator
+ Import-Package: org.osgi.framework
+ Export-Package: org.apache.commons.lang,
+diff -Nur -x '*.orig' -x '*~' freeplane-1.1.0//freeplane_plugin_help/META-INF/MANIFEST.MF freeplane-1.1.0.new//freeplane_plugin_help/META-INF/MANIFEST.MF
+--- freeplane-1.1.0//freeplane_plugin_help/META-INF/MANIFEST.MF 2009-10-11 08:39:06.000000000 +0200
++++ freeplane-1.1.0.new//freeplane_plugin_help/META-INF/MANIFEST.MF 2010-07-03 14:38:53.000000000 +0200
+@@ -8,5 +8,5 @@
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Require-Bundle: org.freeplane.core;bundle-version="1.0.1"
+ Bundle-ClassPath: lib/plugin.jar,
+- lib/jhall.jar
++ ../../../java/jhall.jar
+ Export-Package: org.freeplane.plugin.help;uses:="org.freeplane.core.ui,org.freeplane.core.controller,org.osgi.framework"
+diff -Nur -x '*.orig' -x '*~' freeplane-1.1.0//freeplane_plugin_latex/META-INF/MANIFEST.MF freeplane-1.1.0.new//freeplane_plugin_latex/META-INF/MANIFEST.MF
+--- freeplane-1.1.0//freeplane_plugin_latex/META-INF/MANIFEST.MF 2010-01-07 08:55:45.000000000 +0100
++++ freeplane-1.1.0.new//freeplane_plugin_latex/META-INF/MANIFEST.MF 2010-07-03 14:38:53.000000000 +0200
+@@ -7,5 +7,5 @@
+ Import-Package: org.osgi.framework;version="1.3.0"
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Require-Bundle: org.freeplane.core;bundle-version="1.0.1"
+-Bundle-ClassPath: lib/jlatexmath.jar,
++Bundle-ClassPath: ../../../java/jlatexmath.jar,
+ lib/plugin.jar
+diff -Nur -x '*.orig' -x '*~' freeplane-1.1.0//freeplane_plugin_script/META-INF/MANIFEST.MF freeplane-1.1.0.new//freeplane_plugin_script/META-INF/MANIFEST.MF
+--- freeplane-1.1.0//freeplane_plugin_script/META-INF/MANIFEST.MF 2009-10-11 08:39:07.000000000 +0200
++++ freeplane-1.1.0.new//freeplane_plugin_script/META-INF/MANIFEST.MF 2010-07-03 14:38:53.000000000 +0200
+@@ -7,5 +7,5 @@
+ Import-Package: org.osgi.framework;version="1.3.0"
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Require-Bundle: org.freeplane.core;bundle-version="1.0.1"
+-Bundle-ClassPath: lib/groovy-all-1.5.6.jar,
++Bundle-ClassPath: ../../../java/groovy-all.jar,
+ lib/plugin.jar
+diff -Nur -x '*.orig' -x '*~' freeplane-1.1.0//freeplane_plugin_svg/META-INF/MANIFEST.MF freeplane-1.1.0.new//freeplane_plugin_svg/META-INF/MANIFEST.MF
+--- freeplane-1.1.0//freeplane_plugin_svg/META-INF/MANIFEST.MF 2009-10-11 08:39:07.000000000 +0200
++++ freeplane-1.1.0.new//freeplane_plugin_svg/META-INF/MANIFEST.MF 2010-07-03 14:38:53.000000000 +0200
+@@ -7,27 +7,10 @@
+ Import-Package: org.osgi.framework;version="1.3.0"
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Require-Bundle: org.freeplane.core;bundle-version="1.0.1"
+-Bundle-ClassPath: lib/batik-awt-util.jar,
+- lib/batik-bridge.jar,
+- lib/batik-css.jar,
+- lib/batik-dom.jar,
+- lib/batik-ext.jar,
+- lib/batik-extension.jar,
+- lib/batik-gui-util.jar,
+- lib/batik-gvt.jar,
+- lib/batik-parser.jar,
+- lib/batik-script.jar,
+- lib/batik-anim.jar,
+- lib/batik-codec.jar,
+- lib/batik-svg-dom.jar,
+- lib/batik-svggen.jar,
+- lib/batik-swing.jar,
+- lib/batik-transcoder.jar,
+- lib/batik-util.jar,
+- lib/batik-xml.jar,
+- lib/js.jar,
+- lib/pdf-transcoder.jar,
+- lib/xerces_2_5_0.jar,
+- lib/xml-apis.jar,
++Bundle-ClassPath: ../../../java/batik-all.jar,
++ ../../../java/js.jar,
++ ../../../java/fop.jar,
++ ../../../java/xercesImpl.jar,
++ ../../../java/xml-apis.jar,
+ lib/plugin.jar,
+- lib/xml-apis-ext.jar
++ ../../../java/xml-apis-ext.jar
Added: trunk/freeplane/debian/patches/40_no_winmac.patch
===================================================================
--- trunk/freeplane/debian/patches/40_no_winmac.patch (rev 0)
+++ trunk/freeplane/debian/patches/40_no_winmac.patch 2010-07-12 17:01:55 UTC (rev 12745)
@@ -0,0 +1,11 @@
+--- a/freeplane_framework/ant/build.xml
++++ b/freeplane_framework/ant/build.xml
+@@ -363,7 +363,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"
Added: trunk/freeplane/debian/patches/50_no_copy_files.patch
===================================================================
--- trunk/freeplane/debian/patches/50_no_copy_files.patch (rev 0)
+++ trunk/freeplane/debian/patches/50_no_copy_files.patch 2010-07-12 17:01:55 UTC (rev 12745)
@@ -0,0 +1,34 @@
+diff -Nur -x '*.orig' -x '*~' freeplane-1.1.0//freeplane/ant/build.xml freeplane-1.1.0.new//freeplane/ant/build.xml
+--- freeplane-1.1.0//freeplane/ant/build.xml 2010-05-17 21:54:04.000000000 +0200
++++ freeplane-1.1.0.new//freeplane/ant/build.xml 2010-07-03 14:27:55.000000000 +0200
+@@ -102,14 +102,14 @@
+ </jar>
+ </target>
+
+- <target name="dist" depends="jar, buildmac">
++ <target name="dist" depends="jar">
+ <!-- third party libs -->
+ <mkdir dir="${freeplane.dist.lib}" />
+- <copy todir="${freeplane.dist.lib}">
++ <!-- <copy todir="${freeplane.dist.lib}">
+ <fileset dir="${freeplane.ext.lib}">
+ <include name="*.jar" />
+ </fileset>
+- </copy>
++ </copy> -->
+ <mkdir dir="${dist.resources}" />
+ <copy todir="${dist.resources}">
+ <fileset dir="external-resources"/>
+diff -Nur -x '*.orig' -x '*~' freeplane-1.1.0//freeplane_framework/ant/build.xml freeplane-1.1.0.new//freeplane_framework/ant/build.xml
+--- freeplane-1.1.0//freeplane_framework/ant/build.xml 2010-06-26 17:45:43.000000000 +0200
++++ freeplane-1.1.0.new//freeplane_framework/ant/build.xml 2010-07-03 14:29:39.000000000 +0200
+@@ -48,9 +48,6 @@
+ <mkdir dir="${build}" />
+ <copy todir="${build}">
+ <fileset dir="${script}" />
+- <fileset file="${framework.jar}" />
+- <fileset file="windows-launcher/freeplane.exe" />
+- <fileset file="windows-launcher/freeplaneConsole.exe" />
+ </copy>
+ <chmod file="${build}/freeplane.sh" perm="ugo+rx" />
+ <antcall target="makePlugin" inheritall="false">
Added: trunk/freeplane/debian/patches/series
===================================================================
--- trunk/freeplane/debian/patches/series (rev 0)
+++ trunk/freeplane/debian/patches/series 2010-07-12 17:01:55 UTC (rev 12745)
@@ -0,0 +1,4 @@
+10_libraries_properties.patch
+15_libraries_manifest.patch
+40_no_winmac.patch
+50_no_copy_files.patch
Added: trunk/freeplane/debian/rules
===================================================================
--- trunk/freeplane/debian/rules (rev 0)
+++ trunk/freeplane/debian/rules 2010-07-12 17:01:55 UTC (rev 12745)
@@ -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
Property changes on: trunk/freeplane/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/freeplane/debian/source/format
===================================================================
--- trunk/freeplane/debian/source/format (rev 0)
+++ trunk/freeplane/debian/source/format 2010-07-12 17:01:55 UTC (rev 12745)
@@ -0,0 +1 @@
+3.0 (quilt)
Added: trunk/freeplane/debian/watch
===================================================================
--- trunk/freeplane/debian/watch (rev 0)
+++ trunk/freeplane/debian/watch 2010-07-12 17:01:55 UTC (rev 12745)
@@ -0,0 +1,11 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# See uscan(1) for format
+# Just check status: uscan --report-status
+
+# Compulsory line, this is a version 3 file
+version=3
+
+# Uncomment to find new files on sourceforge, for devscripts >= 2.9
+ http://sf.net/freeplane/freeplane_srcpure-(.*)\.tar\.gz
More information about the pkg-java-commits
mailing list