[pkg-java] r7002 - trunk/batik/debian

[fourmond at alioth.debian.org]

Author: fourmond
Date: 2008-09-15 22:15:11 +0000 (Mon, 15 Sep 2008)
New Revision: 7002

Modified:
   trunk/batik/debian/changelog
   trunk/batik/debian/control
   trunk/batik/debian/rasterizer.sh
Log:
[batik] Updating rasterizer.sh so it works...

Modified: trunk/batik/debian/changelog
===================================================================
--- trunk/batik/debian/changelog	2008-09-15 22:08:10 UTC (rev 7001)
+++ trunk/batik/debian/changelog	2008-09-15 22:15:11 UTC (rev 7002)
@@ -16,9 +16,12 @@
     means that batik can now move to main !
   * Several tweaks in debian/rules to build and install all the jars,
     based on a patch by Sylvestre Ledru <sylvestre.ledru at inria.fr>
-  * Now depends also on libxml-commons-external
+  * Now depends also on libxml-commons-external-java for SVG parsing
+  * Conforms to standards 3.8.0
+  * Updated rasterizer.sh to work with libxml-commons-external-java
+    and openjdk
 
- -- Vincent Fourmond <fourmond at debian.org>  Mon, 21 Jul 2008 23:57:02 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Tue, 16 Sep 2008 00:14:01 +0200
 
 batik (1.6-4) unstable; urgency=low
 

Modified: trunk/batik/debian/control
===================================================================
--- trunk/batik/debian/control	2008-09-15 22:08:10 UTC (rev 7001)
+++ trunk/batik/debian/control	2008-09-15 22:15:11 UTC (rev 7002)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>, Michael Koch <konqueror at gmx.de>, 
  Vincent Fourmond <fourmond at debian.org>
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Build-Depends: debhelper (>= 4.2.30), cdbs
 Build-Depends-Indep: openjdk-6-jdk | sun-java5-jdk | sun-java6-jdk, ant, 
  libbsf-java, libxalan2-java, rhino, libavalon-framework-java (>= 4.2.0), 
@@ -18,8 +18,8 @@
 Depends: openjdk-6-jre | sun-java5-jre | sun-java6-jre | sun-j2re1.4 | java2-runtime,
  libxalan2-java, libbsf-java, 
  libavalon-framework-java (>= 4.2.0), libcommons-io-java, 
- libcommons-logging-java, java-wrappers (>= 0.1.4),
- libxml-commons-external
+ libcommons-logging-java, java-wrappers (>= 0.1.7),
+ libxml-commons-external-java
 Suggests: rhino
 Description: xml.apache.org SVG Library
  Batik is a toolkit for applications or applets that want to use images

Modified: trunk/batik/debian/rasterizer.sh
===================================================================
--- trunk/batik/debian/rasterizer.sh	2008-09-15 22:08:10 UTC (rev 7001)
+++ trunk/batik/debian/rasterizer.sh	2008-09-15 22:15:11 UTC (rev 7002)
@@ -4,12 +4,11 @@
 . /usr/lib/java-wrappers/java-wrappers.sh
 
 # We need sun runtime.
-find_java_runtime sun || { 
-    echo "$0: Sun's java not found, some things won't work" >&2
-    find_java_runtime || echo "$0: No java found at all ! Aborting" >&2 && 
-    exit 1
-}
-find_jars xercesImpl.jar batik-all.jar fop-transcoder.jar 
+find_java_runtime openjdk sun 
+
+find_jars xercesImpl.jar batik-all.jar 
+find_jars xml-apis-ext
+# fop-transcoder.jar 
 find_jars avalon-framework.jar commons-logging.jar commons-io.jar
 
 # We see if there is a -scriptSecurityOn in the commandline