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

[fourmond at alioth.debian.org]

Author: fourmond
Date: 2008-12-11 19:59:11 +0000 (Thu, 11 Dec 2008)
New Revision: 7644

Modified:
   trunk/fop/debian/changelog
   trunk/fop/debian/control
   trunk/fop/debian/fop.sh
Log:
[fop] Few bug fixes, ready for upload

Modified: trunk/fop/debian/changelog
===================================================================
--- trunk/fop/debian/changelog	2008-12-11 19:08:14 UTC (rev 7643)
+++ trunk/fop/debian/changelog	2008-12-11 19:59:11 UTC (rev 7644)
@@ -1,9 +1,13 @@
-fop (1:0.95.dfsg-2) UNRELEASED experimental; urgency=low
+fop (1:0.95.dfsg-2) experimental; urgency=low
 
-  * Tighten up depencies on libxmlgraphics-commons-java (partially
-    closes: #505582)
+  * Tighten up depencies on libxmlgraphics-commons-java and add xml-apis-ext
+    to the wrapper script (closes: #505582)
+  * Depends on libxml-commons-external-java use openjdk-jre-6 as
+    'preferred' JVM (I'm not sure it will run on non-Sun runtime), thanks 
+    to Kobayashi Noritada <nori1 at dolphin.c.u-tokyo.ac.jp> for spotting and for 
+    advice (closes: 508485)
 
- -- Vincent Fourmond <fourmond at debian.org>  Thu, 13 Nov 2008 22:34:06 +0100
+ -- Vincent Fourmond <fourmond at debian.org>  Thu, 11 Dec 2008 20:46:49 +0100
 
 fop (1:0.95.dfsg-1) experimental; urgency=low
 

Modified: trunk/fop/debian/control
===================================================================
--- trunk/fop/debian/control	2008-12-11 19:08:14 UTC (rev 7643)
+++ trunk/fop/debian/control	2008-12-11 19:59:11 UTC (rev 7644)
@@ -6,7 +6,11 @@
  Sylvestre Ledru <sylvestre.ledru at inria.fr>,
  Vincent Fourmond <fourmond at debian.org>, Torsten Werner <twerner at debian.org>
 Build-Depends: debhelper (>= 5), cdbs (>= 0.4.27)
-Build-Depends-Indep: ant-optional, libbatik-java (>= 1.7), libavalon-framework-java (>=4.1.2-2), libxalan2-java, libxerces2-java, openjdk-6-jdk, libcommons-io-java, libcommons-logging-java, junit, libxmlgraphics-commons-java (>= 1.3), libservlet2.4-java, libxml-commons-external-java
+Build-Depends-Indep: ant-optional, libbatik-java (>= 1.7),
+ libavalon-framework-java (>=4.1.2-2), libxalan2-java,
+ libxerces2-java, openjdk-6-jdk, libcommons-io-java,
+ libcommons-logging-java, junit, libxmlgraphics-commons-java (>= 1.3),
+ libservlet2.4-java, libxml-commons-external-java
 Standards-Version: 3.8.0
 Homepage: http://xmlgraphics.apache.org/fop/
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/fop
@@ -15,7 +19,12 @@
 
 Package: fop
 Architecture: all
-Depends: java-gcj-compat-dev | java2-runtime, libxerces2-java, libxalan2-java, libbsf-java, libavalon-framework-java (>=4.1.2-2), libbatik-java (>= 1.7), libcommons-io-java, libcommons-logging-java, libxp6, libxt6, libxtst6, libxmlgraphics-commons-java (>= 1.3.1), java-wrappers (>= 0.1.9)
+Depends: openjdk-6-jre | java2-runtime,
+ libxerces2-java, libxalan2-java, libbsf-java,
+ libavalon-framework-java (>=4.1.2-2), libbatik-java (>= 1.7),
+ libcommons-io-java, libcommons-logging-java, libxp6, libxt6,
+ libxtst6, libxmlgraphics-commons-java (>= 1.3.1), 
+ java-wrappers (>= 0.1.9), libxml-commons-external-java
 Suggests: fop-doc, libservlet2.4-java
 Replaces: libfop-java
 Description: XML to PDF Translator

Modified: trunk/fop/debian/fop.sh
===================================================================
--- trunk/fop/debian/fop.sh	2008-12-11 19:08:14 UTC (rev 7643)
+++ trunk/fop/debian/fop.sh	2008-12-11 19:59:11 UTC (rev 7644)
@@ -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 xml-apis-ext 
 find_jars fop