Author: fourmond Date: 2009-05-12 20:48:03 +0000 (Tue, 12 May 2009) New Revision: 8260
Modified: trunk/fop/debian/changelog trunk/fop/debian/fop.pod trunk/fop/debian/fop.sh Log: [fop] Add support for configuration files Modified: trunk/fop/debian/changelog =================================================================== --- trunk/fop/debian/changelog 2009-05-12 18:47:42 UTC (rev 8259) +++ trunk/fop/debian/changelog 2009-05-12 20:48:03 UTC (rev 8260) @@ -1,3 +1,10 @@ +fop (1:0.95.dfsg-6) unstable; urgency=low + + * Add support for reading configuration files in the wrapper script. + (again: closes: #526092) + + -- Vincent Fourmond <[email protected]> Tue, 12 May 2009 22:46:51 +0200 + fop (1:0.95.dfsg-5) unstable; urgency=low [ Onkar Shinde ] Modified: trunk/fop/debian/fop.pod =================================================================== --- trunk/fop/debian/fop.pod 2009-05-12 18:47:42 UTC (rev 8259) +++ trunk/fop/debian/fop.pod 2009-05-12 20:48:03 UTC (rev 8260) @@ -116,14 +116,20 @@ =head1 HYPENATION -Fop can make use of external hyphenation rules that can be supplied in -the form of a -B<hyphenation jar>. You can find such a one at +B<fop> can make use of external hyphenation rules that can be supplied +in the form of a B<hyphenation jar>. You can find such a one at I<http://offo.sourceforge.net/>. To actually use that, set the B<FOP_HYPHENATION_PATH> environment -variable to the full path of this file. +variable to the full path of this file, or use configuration files, +see below. +=head1 CONFIGURATION FILES + +B<fop> reads two configuration files on startup: I</etc/fop.conf> and +I<$HOME/.foprc>. These are plain shell script files where you can +define for instance the B<FOP_HYPHENATION_PATH> variable. + =head1 JAVA-WRAPPERS NOTE This program is a shell script wrapper based on Modified: trunk/fop/debian/fop.sh =================================================================== --- trunk/fop/debian/fop.sh 2009-05-12 18:47:42 UTC (rev 8259) +++ trunk/fop/debian/fop.sh 2009-05-12 20:48:03 UTC (rev 8260) @@ -4,12 +4,29 @@ # Copyright 2008 by Vincent Fourmond <[email protected]> # # Licensed under the same terms as fop itself, that is under -# the conditions of the Apache 2 licencee. +# the conditions of the Apache 2 licence. # Include the wrappers utility script . /usr/lib/java-wrappers/java-wrappers.sh +# comment this line if you want fop to run without headless property, +# or write a line containing +# HEADLESS= +# in your fop configuration file. +HEADLESS=-Djava.awt.headless=true + + +# Load system-wide configuration, if any +if [ -f /etc/fop.conf ]; then + . /etc/fop.conf +fi + +# Load user's preferences, if any +if [ -f "$HOME/.foprc" ]; then + . $HOME/.foprc +fi + # We prefer to use openjdk or Sun's java if available find_java_runtime openjdk sun || find_java_runtime @@ -24,7 +41,5 @@ find_jars fop -# comment this line if you want fop to run without headless property -HEADLESS=-Djava.awt.headless=true run_java $HEADLESS org.apache.fop.cli.Main "$@" _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
