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

[Mathieu Malaterre]

Author: malat-guest
Date: 2012-01-05 08:32:47 +0000 (Thu, 05 Jan 2012)
New Revision: 15641

Modified:
   trunk/fop/debian/changelog
   trunk/fop/debian/fop.dirs
   trunk/fop/debian/fop.sh
Log:
Flexible configurations

Modified: trunk/fop/debian/changelog
===================================================================
--- trunk/fop/debian/changelog	2012-01-05 00:58:32 UTC (rev 15640)
+++ trunk/fop/debian/changelog	2012-01-05 08:32:47 UTC (rev 15641)
@@ -1,3 +1,9 @@
+fop (1:1.0.dfsg2-6) UNRELEASED; urgency=low
+
+  * Support conf.d like configuration files. Closes: #630198
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Thu, 05 Jan 2012 09:32:15 +0100
+
 fop (1:1.0.dfsg2-5) unstable; urgency=low
 
   * Need ant 1.8.2 at least update d/control.

Modified: trunk/fop/debian/fop.dirs
===================================================================
--- trunk/fop/debian/fop.dirs	2012-01-05 00:58:32 UTC (rev 15640)
+++ trunk/fop/debian/fop.dirs	2012-01-05 08:32:47 UTC (rev 15641)
@@ -1,2 +1,3 @@
 usr/share/java
 usr/bin
+etc/fop.conf.d

Modified: trunk/fop/debian/fop.sh
===================================================================
--- trunk/fop/debian/fop.sh	2012-01-05 00:58:32 UTC (rev 15640)
+++ trunk/fop/debian/fop.sh	2012-01-05 08:32:47 UTC (rev 15641)
@@ -16,6 +16,9 @@
 HEADLESS=-Djava.awt.headless=true
 
 
+for cf in /etc/fop.conf.d/*.conf; do
+    . $cf;
+done
 
 # Load system-wide configuration, if any
 if [ -f /etc/fop.conf ]; then