[pkg-java] r12772 - in trunk/freeplane/debian: . patches

Eric Lavarde ewl-guest at alioth.debian.org
Sun Jul 18 09:20:44 UTC 2010 

Author: ewl-guest
Date: 2010-07-18 09:20:33 +0000 (Sun, 18 Jul 2010)
New Revision: 12772

Modified:
   trunk/freeplane/debian/changelog
   trunk/freeplane/debian/patches/10_libraries_properties.patch
   trunk/freeplane/debian/patches/15_libraries_manifest.patch
Log:
Correct non-working PDF export.


Modified: trunk/freeplane/debian/changelog
===================================================================
--- trunk/freeplane/debian/changelog	2010-07-18 07:26:41 UTC (rev 12771)
+++ trunk/freeplane/debian/changelog	2010-07-18 09:20:33 UTC (rev 12772)
@@ -2,4 +2,4 @@
 
   * Initial release (Closes: #566375).
 
- -- Eric Lavarde <deb at zorglub.s.bawue.de>  Sun, 18 Jul 2010 08:02:41 +0200
+ -- Eric Lavarde <deb at zorglub.s.bawue.de>  Sun, 18 Jul 2010 09:26:51 +0200

Modified: trunk/freeplane/debian/patches/10_libraries_properties.patch
===================================================================
--- trunk/freeplane/debian/patches/10_libraries_properties.patch	2010-07-18 07:26:41 UTC (rev 12771)
+++ trunk/freeplane/debian/patches/10_libraries_properties.patch	2010-07-18 09:20:33 UTC (rev 12772)
@@ -1,6 +1,5 @@
-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
+--- a/freeplane/ant/ant.properties
++++ b/freeplane/ant/ant.properties
 @@ -1,11 +1,11 @@
 -freeplane.ext.lib = ${workspace}/freeplane/lib
 +freeplane.ext.lib = /usr/share/java
@@ -17,44 +16,39 @@
  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 @@
+--- a/freeplane_framework/ant/ant.properties
++++ b/freeplane_framework/ant/ant.properties
+@@ -1,2 +1,2 @@
 -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
+ framework.jar = ${framework.ext.lib}/knopflerfish/framework.jar
+--- a/freeplane_plugin_bugreport/ant/ant.properties
++++ b/freeplane_plugin_bugreport/ant/ant.properties
 @@ -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
+--- a/freeplane_plugin_help/ant/ant.properties
++++ b/freeplane_plugin_help/ant/ant.properties
 @@ -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
+--- a/freeplane_plugin_latex/ant/ant.properties
++++ b/freeplane_plugin_latex/ant/ant.properties
 @@ -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
+--- a/freeplane_plugin_script/ant/ant.properties
++++ b/freeplane_plugin_script/ant/ant.properties
 @@ -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 @@
+--- a/freeplane_plugin_svg/ant/ant.properties
++++ b/freeplane_plugin_svg/ant/ant.properties
+@@ -1,23 +1,18 @@
 -plugin.ext.lib = lib
 +plugin.ext.lib = /usr/share/java
  
@@ -68,9 +62,13 @@
 -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 @@
+-pdf.jars = ${pdf-transcoder.jar}
+-# Possibly also needed to work properly under Debian/Ubuntu:
+-# /usr/share/java/avalon-framework.jar
+-# /usr/share/java/commons-logging.jar
+-# /usr/share/java/commons-io.jar
+-# /usr/share/java/xmlgraphics-commons.jar
++pdf.jars = ${pdf-transcoder.jar}:${plugin.ext.lib}/avalon-framework.jar:${plugin.ext.lib}/commons-logging.jar:${plugin.ext.lib}/commons-io.jar:${plugin.ext.lib}/xmlgraphics-commons.jar
  
  # Xerces2 - Validating XML parser for Java with DOM level 3 support
  # (xercesImpl.jar and xmlParserAPIs.jar)

Modified: trunk/freeplane/debian/patches/15_libraries_manifest.patch
===================================================================
--- trunk/freeplane/debian/patches/15_libraries_manifest.patch	2010-07-18 07:26:41 UTC (rev 12771)
+++ trunk/freeplane/debian/patches/15_libraries_manifest.patch	2010-07-18 09:20:33 UTC (rev 12772)
@@ -1,6 +1,5 @@
-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
+--- a/freeplane/META-INF/MANIFEST.MF
++++ b/freeplane/META-INF/MANIFEST.MF
 @@ -7,11 +7,11 @@
   lib/freeplaneeditor.jar,
   lib/freeplanemac.jar,
@@ -18,9 +17,8 @@
  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
+--- a/freeplane_plugin_help/META-INF/MANIFEST.MF
++++ b/freeplane_plugin_help/META-INF/MANIFEST.MF
 @@ -8,5 +8,5 @@
  Bundle-RequiredExecutionEnvironment: J2SE-1.5
  Require-Bundle: org.freeplane.core;bundle-version="1.0.1"
@@ -28,9 +26,8 @@
 - 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
+--- a/freeplane_plugin_latex/META-INF/MANIFEST.MF
++++ b/freeplane_plugin_latex/META-INF/MANIFEST.MF
 @@ -7,5 +7,5 @@
  Import-Package: org.osgi.framework;version="1.3.0"
  Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -38,9 +35,8 @@
 -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
+--- a/freeplane_plugin_script/META-INF/MANIFEST.MF
++++ b/freeplane_plugin_script/META-INF/MANIFEST.MF
 @@ -7,5 +7,5 @@
  Import-Package: org.osgi.framework;version="1.3.0"
  Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -48,10 +44,9 @@
 -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 @@
+--- a/freeplane_plugin_svg/META-INF/MANIFEST.MF
++++ b/freeplane_plugin_svg/META-INF/MANIFEST.MF
+@@ -7,27 +7,14 @@
  Import-Package: org.osgi.framework;version="1.3.0"
  Bundle-RequiredExecutionEnvironment: J2SE-1.5
  Require-Bundle: org.freeplane.core;bundle-version="1.0.1"
@@ -80,6 +75,10 @@
 +Bundle-ClassPath: ../../../java/batik-all.jar,
 + ../../../java/js.jar,
 + ../../../java/fop.jar,
++ ../../../java/avalon-framework.jar,
++ ../../../java/commons-logging.jar,
++ ../../../java/commons-io.jar,
++ ../../../java/xmlgraphics-commons.jar,
 + ../../../java/xercesImpl.jar,
 + ../../../java/xml-apis.jar,
   lib/plugin.jar,

More information about the pkg-java-commits mailing list