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

[Arnaud Vandyck]

Author: avdyk
Date: 2007-05-10 13:51:48 +0000 (Thu, 10 May 2007)
New Revision: 3430

Modified:
   trunk/fop/debian/changelog
   trunk/fop/debian/fop.sh
Log:
should work ;-)

Modified: trunk/fop/debian/changelog
===================================================================
--- trunk/fop/debian/changelog	2007-05-10 13:06:04 UTC (rev 3429)
+++ trunk/fop/debian/changelog	2007-05-10 13:51:48 UTC (rev 3430)
@@ -1,14 +1,9 @@
-fop (1:0.93.dfsg.1-2) unstable; urgency=low
-
-  * debian/fop.sh: rework with the one from upstream
-
- -- Arnaud Vandyck <avdyk at debian.org>  Thu, 10 May 2007 15:02:42 +0200
-
 fop (1:0.93.dfsg.1-1) unstable; urgency=low
 
   * New upstream (closes: #349376, #406109)
   * fop shell script comes with java.awt.headless set to true (closes:
     #407018)
+  * debian/fop.sh: rework with the one from upstream
   * Removed Ola Lundqvist, Takashi Okamoto, Stefan Gybas and Wolfgang Baer
     from uploaders (closes: #374117)
   * Updated Standards Version to 3.7.2, no change needed
@@ -18,7 +13,7 @@
     to Massimo Manghi (closes: #354086)
   * debian/README.Debian: changed the url to download jai
 
- -- Arnaud Vandyck <avdyk at debian.org>  Thu, 10 May 2007 12:17:35 +0200
+ -- Arnaud Vandyck <avdyk at debian.org>  Thu, 10 May 2007 15:15:19 +0200
 
 fop (1:0.20.5-8) unstable; urgency=low
 

Modified: trunk/fop/debian/fop.sh
===================================================================
--- trunk/fop/debian/fop.sh	2007-05-10 13:06:04 UTC (rev 3429)
+++ trunk/fop/debian/fop.sh	2007-05-10 13:51:48 UTC (rev 3430)
@@ -156,16 +156,7 @@
 # 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 \
+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
@@ -256,9 +247,12 @@
 # Possible SimpleLog values:  "trace", "debug", "info" (default), "warn", "error", or "fatal".
 # LOGLEVEL=-Dorg.apache.commons.logging.simplelog.defaultlog=INFO
 
+# comment this line if you want fop to run without headless property
+HEADLESS=-Djava.awt.headless=true
+
 # Execute FOP using eval/exec to preserve spaces in paths,
 # java options, and FOP args
-fop_exec_command="exec \"$JAVACMD\" $LOGCHOICE $LOGLEVEL -classpath \"$LOCALCLASSPATH\" $FOP_OPTS org.apache.fop.cli.Main $fop_exec_args"
+fop_exec_command="exec \"$JAVACMD\" $HEADLESS $LOGCHOICE $LOGLEVEL -classpath \"$LOCALCLASSPATH\" $FOP_OPTS org.apache.fop.cli.Main $fop_exec_args"
 if $fop_exec_debug ; then
     echo $fop_exec_command
 fi