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

[fourmond at alioth.debian.org]

Author: fourmond
Date: 2008-01-03 00:32:20 +0000 (Thu, 03 Jan 2008)
New Revision: 5268

Added:
   trunk/batik/debian/libbatik-java.manpages
Modified:
   trunk/batik/debian/NEWS
   trunk/batik/debian/changelog
   trunk/batik/debian/control
   trunk/batik/debian/rasterizer.sh
   trunk/batik/debian/wrappers.sh
Log:
[batik] Ready for upload

Modified: trunk/batik/debian/NEWS
===================================================================
--- trunk/batik/debian/NEWS	2008-01-02 21:04:14 UTC (rev 5267)
+++ trunk/batik/debian/NEWS	2008-01-03 00:32:20 UTC (rev 5268)
@@ -3,6 +3,5 @@
   rasterizer now launches by default with -scriptSecurityOff, as it fails 
   to run most of the times if that is not the case. Beware when running
   rasterizer over untrusted sources. See rasterizer(1) for details
-  
 
  -- Vincent Fourmond <fourmond at debian.org>  Wed, 02 Jan 2008 21:43:47 +0100

Modified: trunk/batik/debian/changelog
===================================================================
--- trunk/batik/debian/changelog	2008-01-02 21:04:14 UTC (rev 5267)
+++ trunk/batik/debian/changelog	2008-01-03 00:32:20 UTC (rev 5268)
@@ -1,4 +1,4 @@
-batik (1.6-4) UNRELEASED; urgency=low
+batik (1.6-4) unstable; urgency=low
 
   [ Mark Howard ]
   * debian/watch: added.
@@ -12,8 +12,10 @@
   * rasterizer now launches by default with -scriptSecurityOff so it
     works again (Closes: #413103). Added an option to turn security back on.
   * Comply with policy 3.7.3
+  * Changed build-deps to sun-j2sdk1.4, to reflect the current make-jpkg
+    output.
 
- -- Vincent Fourmond <fourmond at debian.org>  Wed, 02 Jan 2008 22:03:24 +0100
+ -- Vincent Fourmond <fourmond at debian.org>  Thu, 03 Jan 2008 01:20:15 +0100
 
 batik (1.6-3) unstable; urgency=low
 

Modified: trunk/batik/debian/control
===================================================================
--- trunk/batik/debian/control	2008-01-02 21:04:14 UTC (rev 5267)
+++ trunk/batik/debian/control	2008-01-03 00:32:20 UTC (rev 5268)
@@ -6,12 +6,12 @@
  Vincent Fourmond <fourmond at debian.org>
 Standards-Version: 3.7.3
 Build-Depends: debhelper (>= 4.2.30), cdbs
-Build-Depends-Indep: j2sdk1.4 | java2-compiler, ant, libbsf-java, libxalan2-java, rhino, libavalon-framework-java (>= 4.2.0-1), libcommons-io-java, libcommons-logging-java
+Build-Depends-Indep: sun-j2sdk1.4 | java2-compiler, ant, libbsf-java, libxalan2-java, rhino, libavalon-framework-java (>= 4.2.0-1), libcommons-io-java, libcommons-logging-java
 
 Package: libbatik-java
 Section: contrib/libs
 Architecture: all
-Depends: j2re1.4 | java2-runtime, libxalan2-java, libbsf-java, libavalon-framework-java (>= 4.2.0-1), libcommons-io-java, libcommons-logging-java
+Depends: sun-j2re1.4 | java2-runtime, libxalan2-java, libbsf-java, libavalon-framework-java (>= 4.2.0-1), libcommons-io-java, libcommons-logging-java
 Suggests: rhino
 Description: xml.apache.org SVG Library
  Batik is a toolkit for applications or applets that want to use images

Added: trunk/batik/debian/libbatik-java.manpages
===================================================================
--- trunk/batik/debian/libbatik-java.manpages	                        (rev 0)
+++ trunk/batik/debian/libbatik-java.manpages	2008-01-03 00:32:20 UTC (rev 5268)
@@ -0,0 +1,4 @@
+debian/manpages/rasterizer.1
+debian/manpages/svgpp.1
+debian/manpages/squiggle.1
+debian/manpages/ttf2svg.1

Modified: trunk/batik/debian/rasterizer.sh
===================================================================
--- trunk/batik/debian/rasterizer.sh	2008-01-02 21:04:14 UTC (rev 5267)
+++ trunk/batik/debian/rasterizer.sh	2008-01-03 00:32:20 UTC (rev 5268)
@@ -4,7 +4,11 @@
 . /usr/lib/java/wrappers.sh
 
 # We need sun runtime.
-find_java_runtime sun
+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_jars avalon-framework.jar commons-logging.jar commons-io.jar
 

Modified: trunk/batik/debian/wrappers.sh
===================================================================
--- trunk/batik/debian/wrappers.sh	2008-01-02 21:04:14 UTC (rev 5267)
+++ trunk/batik/debian/wrappers.sh	2008-01-03 00:32:20 UTC (rev 5268)
@@ -76,7 +76,6 @@
 	java_show_debug "Found JAVACMD = $JAVACMD"
 	return 0		# Fine
     else
-	echo "$0: no appropriate java environment found, aborting" >& 2
 	exit 1;
     fi