[pkg-java] r7169 - trunk/fop/debian

fourmond at alioth.debian.org fourmond at alioth.debian.org
Sat Oct 18 20:32:08 UTC 2008 

Author: fourmond
Date: 2008-10-18 20:32:07 +0000 (Sat, 18 Oct 2008)
New Revision: 7169

Modified:
   trunk/fop/debian/changelog
   trunk/fop/debian/fop-ttfreader.pod
   trunk/fop/debian/fop-ttfreader.sh
   trunk/fop/debian/fop.pod
   trunk/fop/debian/fop.sh
Log:
[fop] Few last cleanups before upload to main/experimental

Modified: trunk/fop/debian/changelog
===================================================================
--- trunk/fop/debian/changelog	2008-10-17 21:47:59 UTC (rev 7168)
+++ trunk/fop/debian/changelog	2008-10-18 20:32:07 UTC (rev 7169)
@@ -1,4 +1,4 @@
-fop (1:0.95.dfsg-1) experimental UNRELEASED; urgency=low
+fop (1:0.95.dfsg-1) experimental; urgency=low
 
   [ Sylvestre Ledru ]
   * New upstream version (Closes: #494041)
@@ -30,8 +30,12 @@
   * Fix debian/*.pod files.
   * Fix versioned Depends: java-wrappers.
 
- -- Torsten Werner <twerner at debian.org>  Fri, 17 Oct 2008 23:47:17 +0200
+  [ Vincent Fourmond ]
+  * Convert fop-ttfreader.sh to java-wrappers
+  * Updated all manual pages so they now reference java-wrappers(7)
 
+ -- Vincent Fourmond <fourmond at debian.org>  Sat, 18 Oct 2008 20:43:44 +0200
+
 fop (1:0.94.dfsg-2) unstable; urgency=low
 
   * Fixed name of versioned jar.

Modified: trunk/fop/debian/fop-ttfreader.pod
===================================================================
--- trunk/fop/debian/fop-ttfreader.pod	2008-10-17 21:47:59 UTC (rev 7168)
+++ trunk/fop/debian/fop-ttfreader.pod	2008-10-18 20:32:07 UTC (rev 7169)
@@ -44,10 +44,13 @@
 
 =back
 
-=head1 ENVIRONMENT
+=head1 JAVA-WRAPPERS NOTE
 
-You can set the environment variable I<JAVA_OPTS> with options that
-are passed to the java interpreter.
+This program is a shell script wrapper based on
+B<java-wrappers>(7).
+You therefore benefit from several features; please see the 
+B<java-wrappers>(7)
+manual page for more information about them.
 
 =head1 AUTHOR
 
@@ -55,6 +58,6 @@
 
 =head1 SEE ALSO
 
-fop
+B<fop>(1), B<java-wrappers>(7)
 
 =cut

Modified: trunk/fop/debian/fop-ttfreader.sh
===================================================================
--- trunk/fop/debian/fop-ttfreader.sh	2008-10-17 21:47:59 UTC (rev 7168)
+++ trunk/fop/debian/fop-ttfreader.sh	2008-10-18 20:32:07 UTC (rev 7169)
@@ -1,64 +1,21 @@
 #!/bin/sh
-# Command line wrapper for running fop.
-# Written by Ola Lundqvist <opal at debian.org>
-# Adapted by Arnaud Vandyck <avdyk at debian.org>
-# from the fop.sh upstream script
 
-if [ "$OS" = "Windows_NT" ] ; then
-    pathSepChar=";"
-else
-    pathSepChar=":"
-fi
+# Shell script wrapper around the fop-ttfreader program,
+# Copyright 2008 by Vincent Fourmond <fourmond at debian.org>
+#
+# Licensed under the same terms as fop itself, that is under
+# the conditions of the Apache 2 licencee.
 
-if [ -z "$JAVACMD" ] ; then
-  if [ -n "$JAVA_HOME"  ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-    fi
-  else
-    JAVACMD=`which java 2> /dev/null `
-    if [ -z "$JAVACMD" ] ; then
-        JAVACMD=java
-    fi
-  fi
-fi
+# Include the wrappers utility script
+. /usr/lib/java-wrappers/java-wrappers.sh
 
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly."
-  echo "  We cannot execute $JAVACMD"
-  exit 1
-fi
 
-if [ -n "$CLASSPATH" ] ; then
-  LOCALCLASSPATH=$CLASSPATH
-fi
+# We prefer to use openjdk or Sun's java if available
+find_java_runtime openjdk sun  || find_java_runtime 
 
-# add fop.jar, fop-sandbox and fop-hyph.jar, which reside in $FOP_HOME/build
-#LOCALCLASSPATH=${FOP_HOME}/build/fop.jar${pathSepChar}${FOP_HOME}/build/fop-sandbox.jar${pathSepChar}${FOP_HOME}/build/fop-hyph.jar${pathSepChar}$LOCALCLASSPATH
-JLIBS=/usr/share/java
-# Debian specific LOCALCLASSPATH
-LOCALCLASSPATH=${JLIBS}/fop.jar${pathSepChar}$LOCALCLASSPATH
+find_jars commons-io avalon-framework serializer xalan2 xml-apis 
+find_jars batik-all commons-logging servlet-api xercesImpl xmlgraphics-commons
+find_jars fop
 
-# Does not exists in the the Debian package ${pathSepChar}${FOP_HOME}/build/fop-sandbox.jar${pathSepChar}${FOP_HOME}/build/fop-hyph.jar
 
-# add in the dependency .jar files, which reside in $FOP_HOME/lib
-DIRLIBS="${JLIBS}/commons-io.jar ${JLIBS}/avalon-framework.jar ${JLIBS}/serializer.jar ${JLIBS}/xalan2.jar ${JLIBS}/xml-apis.jar ${JLIBS}/batik-all.jar ${JLIBS}/commons-logging.jar ${JLIBS}/servlet-api.jar ${JLIBS}/xercesImpl.jar ${JLIBS}/xmlgraphics-commons.jar"
-
-for i in ${DIRLIBS}
-do
-    # if the directory is empty, then it will return the input string
-    # this is stupid, so case for it
-    if [ "$i" != "${DIRLIBS}" ] ; then
-      if [ -z "$LOCALCLASSPATH" ] ; then
-        LOCALCLASSPATH=$i
-      else
-        LOCALCLASSPATH="$i"${pathSepChar}$LOCALCLASSPATH
-      fi
-    fi
-done
-
-$JAVACMD -classpath $LOCALCLASSPATH \
- $JAVA_OPTS org.apache.fop.fonts.apps.TTFReader "$@"
+run_java org.apache.fop.fonts.apps.TTFReader  "$@"

Modified: trunk/fop/debian/fop.pod
===================================================================
--- trunk/fop/debian/fop.pod	2008-10-17 21:47:59 UTC (rev 7168)
+++ trunk/fop/debian/fop.pod	2008-10-18 20:32:07 UTC (rev 7169)
@@ -114,10 +114,13 @@
 
 =back
 
-=head1 ENVIRONMENT
+=head1 JAVA-WRAPPERS NOTE
 
-You can set the environment variable I<JAVA_OPTS> with options that
-are passed to the java interpreter.
+This program is a shell script wrapper based on
+B<java-wrappers>(7).
+You therefore benefit from several features; please see the 
+B<java-wrappers>(7)
+manual page for more information about them.
 
 =head1 AUTHOR
 
@@ -125,4 +128,6 @@
 
 =head1 SEE ALSO
 
+B<fop-ttfreader>(1), B<java-wrappers>(7)
+
 =cut

Modified: trunk/fop/debian/fop.sh
===================================================================
--- trunk/fop/debian/fop.sh	2008-10-17 21:47:59 UTC (rev 7168)
+++ trunk/fop/debian/fop.sh	2008-10-18 20:32:07 UTC (rev 7169)
@@ -15,6 +15,7 @@
 
 find_jars commons-io avalon-framework serializer xalan2 xml-apis 
 find_jars batik-all commons-logging servlet-api xercesImpl xmlgraphics-commons
+find_jars fop
 
 
 # comment this line if you want fop to run without headless property

More information about the pkg-java-commits mailing list