[pkg-java] r8036 - in trunk/freemind/debian: . patches

[ewl-guest at alioth.debian.org]

Author: ewl-guest
Date: 2009-03-04 20:30:47 +0000 (Wed, 04 Mar 2009)
New Revision: 8036

Modified:
   trunk/freemind/debian/changelog
   trunk/freemind/debian/control
   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
Log:
Fix javahelp2 dependencies and add forgotten bug closing.


Modified: trunk/freemind/debian/changelog
===================================================================
--- trunk/freemind/debian/changelog	2009-03-03 05:18:34 UTC (rev 8035)
+++ trunk/freemind/debian/changelog	2009-03-04 20:30:47 UTC (rev 8036)
@@ -1,3 +1,13 @@
+freemind (0.9.0~rc1-2) unstable; urgency=low
+
+  * Forgotten in last release:
+    + Desktop integration (Closes: #296258).
+    + Latest version packaged (Closes: #485629).
+    + Using OpenJDK and moving to main (Closes: #490623, #466303, #515107).
+  * Fix forgotten javahelp2 dependencies and patches.
+
+ -- Eric Lavarde <deb at zorglub.s.bawue.de>  Sun, 01 Mar 2009 00:49:27 +0100
+
 freemind (0.9.0~rc1-1) unstable; urgency=low
 
   * New upstream version.

Modified: trunk/freemind/debian/control
===================================================================
--- trunk/freemind/debian/control	2009-03-03 05:18:34 UTC (rev 8035)
+++ trunk/freemind/debian/control	2009-03-04 20:30:47 UTC (rev 8036)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Eric Lavarde <deb at zorglub.s.bawue.de>
-Build-Depends-Indep: docbook-to-man, ant, ant-optional, openjdk-6-jdk, imagemagick, libcommons-lang-java, libbatik-java (>= 1.6), rhino, libforms-java, groovy, libjibx-java, libxsd2jibx-java, simplyhtml
+Build-Depends-Indep: docbook-to-man, ant, ant-optional, openjdk-6-jdk, imagemagick, libcommons-lang-java, libbatik-java (>= 1.6), rhino, libforms-java, groovy, libjibx-java, libxsd2jibx-java, simplyhtml, javahelp2
 Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.8)
 Homepage: http://freemind.sourceforge.net/
 Standards-Version: 3.8.0.0
@@ -55,7 +55,7 @@
 
 Package: freemind-plugins-help
 Architecture: all
-Depends: openjdk-6-jre | sun-java5-jre | sun-java6-jre | java2-runtime, freemind (= ${binary:Version}), ${misc:Depends}
+Depends: openjdk-6-jre | sun-java5-jre | sun-java6-jre | java2-runtime, freemind (= ${binary:Version}), ${misc:Depends}, javahelp2
 Description: Java Plugin for FreeMind to show an extended online help
  This plugin will add a menu point 'Help -> Online Help'.
 

Modified: trunk/freemind/debian/patches/30_plug_help.patch
===================================================================
--- trunk/freemind/debian/patches/30_plug_help.patch	2009-03-03 05:18:34 UTC (rev 8035)
+++ trunk/freemind/debian/patches/30_plug_help.patch	2009-03-04 20:30:47 UTC (rev 8036)
@@ -4,7 +4,7 @@
  <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
  <plugin label="plugins/FreemindHelp">
 -	<plugin_classpath jar="help/jhall.jar"/>
-+	<plugin_classpath jar="/usr/local/share/java/jhall.jar"/>
++	<plugin_classpath jar="/usr/share/java/jhall.jar"/>
  	<plugin_classpath jar="help/help_plugin.jar"/>
  	<plugin_action 
  		documentation="%plugins/FreemindHelp.xml_documentation" 

Modified: trunk/freemind/debian/patches/31_plug_help_build.patch
===================================================================
--- trunk/freemind/debian/patches/31_plug_help_build.patch	2009-03-03 05:18:34 UTC (rev 8035)
+++ trunk/freemind/debian/patches/31_plug_help_build.patch	2009-03-04 20:30:47 UTC (rev 8036)
@@ -1,12 +1,14 @@
---- freemind/plugins/build_help.xml
-+++ freemind/plugins/build_help.xml
+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"/>
  	<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="/usr/local/share/java/jhall.jar"/>
- 	<property name="additional.lib.pattern" value="${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"/>
  
  	<import file="build_import.xml" />
  

Modified: trunk/freemind/debian/patches/32_plug_help_manifest.patch
===================================================================
--- trunk/freemind/debian/patches/32_plug_help_manifest.patch	2009-03-03 05:18:34 UTC (rev 8035)
+++ trunk/freemind/debian/patches/32_plug_help_manifest.patch	2009-03-04 20:30:47 UTC (rev 8036)
@@ -4,5 +4,5 @@
  Main-Class: sunw.demo.jhdemo.Runner
  Run-Class: sunw.demo.jhdemo.JHLauncher
 -Class-Path: hsviewer.jar jhall.jar doc
-+Class-Path: hsviewer.jar /usr/local/share/java/jhall.jar doc
++Class-Path: hsviewer.jar /usr/share/java/jhall.jar doc
  Arguments: -helpset .doc/freemind.hs