[pkg-java] r5596 - in branches/freemind/BRANCH_0.8/debian: . patches
ewl-guest at alioth.debian.org
ewl-guest at alioth.debian.org
Tue Feb 5 21:59:21 UTC 2008
Author: ewl-guest
Date: 2008-02-05 21:59:21 +0000 (Tue, 05 Feb 2008)
New Revision: 5596
Removed:
branches/freemind/BRANCH_0.8/debian/freemind-plugins-help.README.Debian
Modified:
branches/freemind/BRANCH_0.8/debian/changelog
branches/freemind/BRANCH_0.8/debian/control
branches/freemind/BRANCH_0.8/debian/export-freemind-cvs.sh
branches/freemind/BRANCH_0.8/debian/patches/30_plug_help.patch
branches/freemind/BRANCH_0.8/debian/patches/31_plug_help_build.patch
branches/freemind/BRANCH_0.8/debian/patches/32_plug_help_manifest.patch
branches/freemind/BRANCH_0.8/debian/rules
branches/freemind/BRANCH_0.8/debian/urlsee
Log:
Updated to 0.8.1 and better java dependencies.
Use javahelp2 package from standard Debian repository.
Better urlsee handling with xdg-open.
Modified: branches/freemind/BRANCH_0.8/debian/changelog
===================================================================
--- branches/freemind/BRANCH_0.8/debian/changelog 2008-02-05 19:39:31 UTC (rev 5595)
+++ branches/freemind/BRANCH_0.8/debian/changelog 2008-02-05 21:59:21 UTC (rev 5596)
@@ -1,3 +1,10 @@
+freemind (0.8.1-1) UNRELEASED; urgency=low
+
+ * Upstream minor release to add support for Java 6 (preferences dialog
+ and encryption were fixed).
+
+ -- Eric Lavarde <deb at zorglub.s.bawue.de> Tue, 05 Feb 2008 22:23:06 +0100
+
freemind (0.8.0+01-4) unstable; urgency=low
* Corrected polish translation (thanks to hekto5 on sf.net).
Modified: branches/freemind/BRANCH_0.8/debian/control
===================================================================
--- branches/freemind/BRANCH_0.8/debian/control 2008-02-05 19:39:31 UTC (rev 5595)
+++ branches/freemind/BRANCH_0.8/debian/control 2008-02-05 21:59:21 UTC (rev 5596)
@@ -2,13 +2,13 @@
Section: contrib/text
Priority: optional
Maintainer: Eric Lavarde <deb at zorglub.s.bawue.de>
-Build-Depends-Indep: debhelper (>= 4.1.0), cdbs (>= 0.4.8), docbook-to-man, ant, j2sdk1.4 | j2sdk1.5 | java2-compiler, imagemagick, librelaxng-datatype-java, libjaxp1.2-java, libcommons-lang-java, libbatik-java (>= 1.6), rhino, libxerces2-java, libforms-java, libcommons-codec-java
+Build-Depends-Indep: debhelper (>= 4.1.0), cdbs (>= 0.4.8), docbook-to-man, ant, sun-j2sdk1.4 | java2-compiler, imagemagick, librelaxng-datatype-java, libjaxp1.2-java, libcommons-lang-java, libbatik-java (>= 1.6), rhino, libxerces2-java, libforms-java, libcommons-codec-java
Standards-Version: 3.6.2.0
Package: freemind
Architecture: all
-Depends: j2re1.4 | j2re1.5 | java2-runtime, librelaxng-datatype-java, libjaxp1.2-java, libcommons-lang-java, libforms-java, libcommons-codec-java
-Recommends: mozilla-browser | www-browser
+Depends: sun-j2re1.4 | sun-java5-jre | sun-java6-jre | java2-runtime, librelaxng-datatype-java, libjaxp1.2-java, libcommons-lang-java, libforms-java, libcommons-codec-java
+Recommends: xdg-utils, mozilla-browser | www-browser
Suggests: freemind-plugins-help, freemind-plugins-svg, freemind-plugins-time, java-package, freemind-plugins-collab-jabber
Description: Java Program for creating and viewing Mindmaps
Taking the Concept-Mapping approach to Human-Computer Interface design.
@@ -20,7 +20,7 @@
Home: http://freemind.sourceforge.net/
(and http://freemind.sourceforge.net/wiki/index.php/FreeMind_on_Linux)
.
- Use java-package to create a required Sun/Blackdown Java Runtime package.
+ Use a Java(TM) Runtime Environment 1.4, 1.5 or 6.
FreeMind doesn't work with free (and incomplete) Java implementations.
#Package: freemind-browser
@@ -33,30 +33,26 @@
Package: freemind-plugins-svg
Architecture: all
-Depends: j2re1.4 | j2re1.5 | java2-runtime, freemind (>= 0.7.9.rc3), libbatik-java (>= 1.6), rhino, libxerces2-java
+Depends: sun-j2re1.4 | sun-java5-jre | sun-java6-jre | java2-runtime, freemind (>= 0.7.9.rc3), libbatik-java (>= 1.6), rhino, libxerces2-java
Description: Java Plugin for FreeMind to export Mindmaps to SVG and PDF
This plugin will add two menu points 'File -> Export -> SVG-Export' and
'File -> Export -> PDF-Export'.
Package: freemind-plugins-help
Architecture: all
-Depends: j2re1.4 | j2re1.5 | java2-runtime, freemind (>= 0.7.9.rc3)
+Depends: sun-j2re1.4 | sun-java5-jre | sun-java6-jre | java2-runtime, freemind (>= 0.7.9.rc3), javahelp2
Description: Java Plugin for FreeMind to show an extended online help
This plugin will add a menu point 'Help -> Online Help'.
- .
- This plugin will only work if you download JavaHelp (non free) from
- http://java.sun.com/products/javahelp/ and copy jhall.jar to
- /usr/local/share/java.
Package: freemind-plugins-time
Architecture: all
-Depends: j2re1.4 | j2re1.5 | java2-runtime, freemind (>= 0.7.9.rc3), libjcalendar-java
+Depends: sun-j2re1.4 | sun-java5-jre | sun-java6-jre | java2-runtime, freemind (>= 0.7.9.rc3), libjcalendar-java
Description: Java Plugin for FreeMind to paste dates and set reminders
This plugin will add a menu point 'Tools -> Show Calendar...'.
#Package: freemind-plugins-collab-jabber
#Architecture: all
-#Depends: j2re1.4 | j2re1.5 | java2-runtime, freemind (>= 0.7.9.rc3), libcommons-logging-java, libcrimson-java, liboro-java, libgnujaxp-java, libjdom0-java, liblog4j1.2-java
+#Depends: sun-j2re1.4 | sun-java5-jre | sun-java6-jre | java2-runtime, freemind (>= 0.7.9.rc3), libcommons-logging-java, libcrimson-java, liboro-java, libgnujaxp-java, libjdom0-java, liblog4j1.2-java
#Description: Java Plugin for FreeMind to collaborate over Jabber.
# This plugin will add a menu point 'Tools -> Start Collaboration Mode'.
# .
Modified: branches/freemind/BRANCH_0.8/debian/export-freemind-cvs.sh
===================================================================
--- branches/freemind/BRANCH_0.8/debian/export-freemind-cvs.sh 2008-02-05 19:39:31 UTC (rev 5595)
+++ branches/freemind/BRANCH_0.8/debian/export-freemind-cvs.sh 2008-02-05 21:59:21 UTC (rev 5596)
@@ -12,7 +12,7 @@
freemind_tar="freemind_$1"
mkdir "${freemind_dir}" || exit 1 # we don't want to overwrite anything...
cd "${freemind_dir}" || exit 1
-cvs -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/freemind export -r "$2" freemind || exit 1
+cvs -d:pserver:anonymous at freemind.cvs.sourceforge.net:/cvsroot/freemind export -r "$2" freemind || exit 1
### SAVE FIRST THE WHOLE FREEMIND TREE ### For another version of this script
#cd ..
Deleted: branches/freemind/BRANCH_0.8/debian/freemind-plugins-help.README.Debian
===================================================================
--- branches/freemind/BRANCH_0.8/debian/freemind-plugins-help.README.Debian 2008-02-05 19:39:31 UTC (rev 5595)
+++ branches/freemind/BRANCH_0.8/debian/freemind-plugins-help.README.Debian 2008-02-05 21:59:21 UTC (rev 5596)
@@ -1,8 +0,0 @@
-freemind-plugins-help for Debian
---------------------------------
-
-This plugin will only work if you download JavaHelp (non free) from
-http://java.sun.com/products/javahelp/ and copy jhall.jar to
-/usr/local/share/java.
-
--- Eric Lavarde <deb at zorglub.s.bawue.de>, Tue, 15 Mar 2005 20:30:14 +0100
Modified: branches/freemind/BRANCH_0.8/debian/patches/30_plug_help.patch
===================================================================
--- branches/freemind/BRANCH_0.8/debian/patches/30_plug_help.patch 2008-02-05 19:39:31 UTC (rev 5595)
+++ branches/freemind/BRANCH_0.8/debian/patches/30_plug_help.patch 2008-02-05 21:59:21 UTC (rev 5596)
@@ -4,7 +4,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<plugin>
- <plugin_classpath jar="plugins/help/jhall.jar"/>
-+ <plugin_classpath jar="/usr/local/share/java/jhall.jar"/>
++ <plugin_classpath jar="/usr/share/java/jhall.jar"/>
<plugin_classpath jar="plugins/help/help_plugin.jar"/>
<plugin_action
documentation="%plugins/FreemindHelp.xml_documentation"
Modified: branches/freemind/BRANCH_0.8/debian/patches/31_plug_help_build.patch
===================================================================
--- branches/freemind/BRANCH_0.8/debian/patches/31_plug_help_build.patch 2008-02-05 19:39:31 UTC (rev 5595)
+++ branches/freemind/BRANCH_0.8/debian/patches/31_plug_help_build.patch 2008-02-05 21:59:21 UTC (rev 5596)
@@ -5,7 +5,7 @@
<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" value="/usr/share/java/jhall.jar"/>
<property name="additional.lib.pattern" value="${plugin.dir}/jhall.jar"/>
<import file="build_import.xml" />
Modified: branches/freemind/BRANCH_0.8/debian/patches/32_plug_help_manifest.patch
===================================================================
--- branches/freemind/BRANCH_0.8/debian/patches/32_plug_help_manifest.patch 2008-02-05 19:39:31 UTC (rev 5595)
+++ branches/freemind/BRANCH_0.8/debian/patches/32_plug_help_manifest.patch 2008-02-05 21:59:21 UTC (rev 5596)
@@ -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
Modified: branches/freemind/BRANCH_0.8/debian/rules
===================================================================
--- branches/freemind/BRANCH_0.8/debian/rules 2008-02-05 19:39:31 UTC (rev 5595)
+++ branches/freemind/BRANCH_0.8/debian/rules 2008-02-05 21:59:21 UTC (rev 5596)
@@ -6,12 +6,12 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
#FREE JAVA (aka kaffe)
-JAVA_HOME_DIRS := /usr/lib/kaffe
-JAVACMD := /usr/lib/kaffe/bin/java
+#JAVA_HOME_DIRS := /usr/lib/kaffe
+#JAVACMD := /usr/lib/kaffe/bin/java
#DEB_ANT_COMPILER := jikes
#NON-FREE JAVA (aka Sun)
-#JAVA_HOME_DIRS := /usr/lib/j2sdk1.4-sun
+JAVA_HOME_DIRS := /usr/lib/j2sdk1.4-sun
ANT_HOME := /usr/share/ant
DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar xercesImpl xmlParserAPIs
@@ -31,4 +31,4 @@
-rmdir bin
get-orig-source:
- debian/export-freemind-cvs.sh 0.8.0+01 FM-0-8-0
+ debian/export-freemind-cvs.sh 0.8.1 FM-0-8-1
Modified: branches/freemind/BRANCH_0.8/debian/urlsee
===================================================================
--- branches/freemind/BRANCH_0.8/debian/urlsee 2008-02-05 19:39:31 UTC (rev 5595)
+++ branches/freemind/BRANCH_0.8/debian/urlsee 2008-02-05 21:59:21 UTC (rev 5596)
@@ -34,14 +34,14 @@
try_all_cmds() {
local file cmd
- file=$1
+ file="$1"
shift
for cmd in "${@}"
do
cmd=$(which "${cmd}")
if [ -x "${cmd}" ]
then
- _debug "${cmd}" "${file}"
+ _debug "CALLING ${cmd}" "${file}"
exec "${cmd}" "${file}"
fi
done
@@ -55,6 +55,49 @@
FILENAME="$1"
fi
+### we start with the most generic and portable possibility ###
+if [ -x "$(which xdg-open)" ]
+then
+ _debug "exec xdg-open ${FILENAME}"
+ exec xdg-open "${FILENAME}"
+fi
+
+### if this wasn't possible, we try with desktop specific commands ###
+
+# try KDE with kfmclient
+if [ "${DESKTOP_SESSION}" = "kde" ] && [ -x "$(which kfmclient)" ]
+then
+ _debug "CALLING KDE kfmclient exec ${FILENAME}"
+ exec kfmclient exec "${FILENAME}"
+fi
+
+# try GNOME with gnome-open
+if [ "${DESKTOP_SESSION}" = "gnome" ] && [ -x "$(which gnome-open)" ]
+then
+ _debug "CALLING GNOME gnome-open ${FILENAME}"
+ exec gnome-open "${FILENAME}"
+fi
+
+# try XFce with exo-open
+if [ "${DESKTOP_SESSION}" = "xfc4" ] && [ -x "$(which exo-open)" ]
+then
+ _debug "CALLING XFce4 exo-open ${FILENAME}"
+ exec exo-open "${FILENAME}"
+fi
+
+### Looks like we're not using one of the standard desktops, ###
+### so we just try the same commands without caring for env. ###
+try_all_cmds "${FILENAME}" gnome-open exo-open
+if [ -x "$(which kfmclient)" ]
+then # we can't use try_all_cmds because we have 2 parameters
+ _debug "CALLING kfmclient exec ${FILENAME}"
+ exec kfmclient exec "${FILENAME}"
+fi
+
+### And now, we need to go the messy way ###
+### I might remove this part in the future ###
+_debug "Going for the messy path, it might fail..."
+
HTTPNAME=${FILENAME#*://} # covers all kind of url protocol
MAILNAME=${FILENAME#mailto:} # covers only mailto addresses
LOCALNAME=${FILENAME#file:/} # covers only local files URL
More information about the pkg-java-commits
mailing list