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

Mon Jul 21 22:11:57 UTC 2008

Author: fourmond
Date: 2008-07-21 22:11:56 +0000 (Mon, 21 Jul 2008)
New Revision: 6727

Modified:
   trunk/batik/debian/changelog
   trunk/batik/debian/control
   trunk/batik/debian/copyright
   trunk/batik/debian/rules
Log:
[batik] Many updates + including parts of the pacth from Sylvestre Ledru; releasability is getting much closer...

Modified: trunk/batik/debian/changelog
===================================================================

--- trunk/batik/debian/changelog	2008-07-21 21:14:12 UTC (rev 6726)
+++ trunk/batik/debian/changelog	2008-07-21 22:11:56 UTC (rev 6727)
@@ -1,7 +1,7 @@
 batik (1.7-1) UNRELEASED experimental; urgency=low
 
   * DO NOT UPLOAD YET, FAR FROM READY ! (upload to experimental first)
-  * New upstream release (Closes: #417888)
+  * New upstream release (Closes: #417888, #490556)
   * Switched to using java-wrappers for executables; dropping the 
     /usr/lib/java/wrappers.sh script
   * Switched debian/copyright to a machine-readable format
@@ -10,12 +10,15 @@
   * Removing 01_build_xml, as the created target (pdf-transcoder) cannot
     be built anymore
   * Fixed JAVA_HOME_DIRS so it can build with Sun's java 5
-  * Strip the full text of the Apache-2.0 license, as is now is
+  * Strip the full text of the Apache-2.0 license, as it now is
     in the common licenses
-  * Now autobuilds correctly, provided Sun's license has been accepted
-    in the autobuilder (closes: #397562).
+  * Switch to openjdk-6-jdk for building (closes: #397562), which
+    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
 
- -- Vincent Fourmond <fourmond at debian.org>  Sat, 28 Jun 2008 21:14:59 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Mon, 21 Jul 2008 23:57:02 +0200
 
 batik (1.6-4) unstable; urgency=low
 

Modified: trunk/batik/debian/control
===================================================================
--- trunk/batik/debian/control	2008-07-21 21:14:12 UTC (rev 6726)
+++ trunk/batik/debian/control	2008-07-21 22:11:56 UTC (rev 6727)
@@ -1,24 +1,25 @@
 Source: batik
-Section: contrib/libs
+Section: libs
 Priority: optional
 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
 Build-Depends: debhelper (>= 4.2.30), cdbs
-Build-Depends-Indep: sun-java5-jdk | sun-java6-jdk | java2-compiler, ant, 
+Build-Depends-Indep: openjdk-6-jdk | sun-java5-jdk | sun-java6-jdk, ant, 
  libbsf-java, libxalan2-java, rhino, libavalon-framework-java (>= 4.2.0), 
  libcommons-io-java, libcommons-logging-java
 Homepage: http://xml.apache.org/batik/
 
 
 Package: libbatik-java
-Section: contrib/libs
+Section: libs
 Architecture: all
-Depends: sun-java5-jre | sun-java6-jre | sun-j2re1.4 | java2-runtime,
+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)
+ libcommons-logging-java, java-wrappers (>= 0.1.4),
+ libxml-commons-external
 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/copyright
===================================================================
--- trunk/batik/debian/copyright	2008-07-21 21:14:12 UTC (rev 6726)
+++ trunk/batik/debian/copyright	2008-07-21 22:11:56 UTC (rev 6727)
@@ -1,8 +1,10 @@
+Format-Specification:
+    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Upstream-Source: http://xml.apache.org/batik
+
 This package was debianized by Jeff Bailey <jbailey at debian.org> on
 Tue, 11 Jun 2002 10:52:34 -0400.
 
-It was downloaded from <http://xml.apache.org/batik>.
-
 Files: debian/*
 Copyright: 2002-2008 Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 License: Apache-2.0

Modified: trunk/batik/debian/rules
===================================================================
--- trunk/batik/debian/rules	2008-07-21 21:14:12 UTC (rev 6726)
+++ trunk/batik/debian/rules	2008-07-21 22:11:56 UTC (rev 6727)
@@ -12,11 +12,12 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME_DIRS       := /usr/lib/jvm/java-1.5.0-sun /usr/lib/jvm/java-6-sun
+JAVA_HOME_DIRS       := /usr/lib/jvm/java-6-openjdk \
+	/usr/lib/jvm/java-1.5.0-sun /usr/lib/jvm/java-6-sun
 ANT_HOME             := /usr/share/ant
 DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar bfs gnujaxp js xalan2 
 DEB_ANT_COMPILER     := modern
-DEB_ANT_BUILD_TARGET := all-jar
+DEB_ANT_BUILD_TARGET := all-jar libs-jar ext-jar transcoder-jar
 DEB_BUILDDIR         := .
 DEB_ANT_BUILDFILE    := build.xml
 DEB_ANT_CLEAN_TARGET := clean
@@ -27,9 +28,13 @@
 LIBRARY=batik
 VERSION=1.7
 
+LIB_NAMES = all libs ext transcoder
 install/libbatik-java::
-	install -m 644 batik-1.7/lib/batik-all.jar debian/libbatik-java/usr/share/java/batik-all-$(VERSION).jar
-	ln -s batik-all-$(VERSION).jar debian/libbatik-java/usr/share/java/batik-$(VERSION).jar
+# Install all jar built
+	for name in $(LIB_NAMES); do \
+	  install -m 644 batik-$(VERSION)/lib/batik-$$name.jar debian/libbatik-java/usr/share/java/batik-$$name-$(VERSION).jar; \
+	  ln -s batik-$$name-$(VERSION).jar debian/libbatik-java/usr/share/java/batik-$$name.jar; \
+	done
 
 	# Install wrapper scripts
 	install -d debian/libbatik-java/usr/bin


