CVS batik/debian

[Arnaud Vandyck]

Update of /cvsroot/pkg-java/batik/debian
In directory haydn:/tmp/cvs-serv26682

Modified Files:
	changelog control copyright libbatik-java.README.Debian 
	libbatik-java.install rules 
Log Message:
new upstream + changes by Wolfgang

--- /cvsroot/pkg-java/batik/debian/changelog	2004/02/12 17:45:54	1.3
+++ /cvsroot/pkg-java/batik/debian/changelog	2005/03/21 15:11:59	1.4
@@ -1,3 +1,15 @@
+batik (1.5.1-1) unstable; urgency=low
+
+  * New upstream release - security fix [CAN-2005-0508] (closes: #288009)
+  * Added rhino as build dependency
+  * Added rhino to Suggests
+  * Switched to jdk modern compiler because jikes fails
+  * Updated README.Debian explaining why built with non-free jdk
+  * Updated standards version to 3.6.1 - no changes
+  * avdyk: I added Wolfgang to the uploaders
+  
+ -- Wolfgang Baer <WBaer@gmx.de>  Sun,  6 Mar 2005 20:30:08 +0100
+
 batik (1.5final-3) unstable; urgency=low
 
   * expand SVG in description (closes: #173105).
--- /cvsroot/pkg-java/batik/debian/control	2004/02/12 17:45:54	1.3
+++ /cvsroot/pkg-java/batik/debian/control	2005/03/21 15:11:59	1.4
@@ -2,14 +2,15 @@
 Section: contrib/libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Ola Lundqvist <opal@debian.org>, Takashi Okamoto <tora@debian.org>, Stefan Gybas <sgybas@debian.org>, Arnaud Vandyck <avdyk@debian.org>
-Standards-Version: 3.5.6.0
-Build-Depends-Indep: debhelper (> 4), j2sdk1.4 | java2-compiler, cdbs (>= 0.4.8), libgnujaxp-java, ant (>= 1.5.4-2), libbsf-java, libxalan2-java
+Uploaders: Ola Lundqvist <opal@debian.org>, Takashi Okamoto <tora@debian.org>, Stefan Gybas <sgybas@debian.org>, Arnaud Vandyck <avdyk@debian.org>, Wolfgang Baer <WBaer@gmx.de>
+Standards-Version: 3.6.1
+Build-Depends-Indep: debhelper (>= 4.2.30), j2sdk1.4 | java2-compiler, cdbs, libgnujaxp-java, libant1.6-java, libbsf-java, libxalan2-java, rhino
 
 Package: libbatik-java
 Section: contrib/libs
 Architecture: all
-Depends: j2re1.4|j2re1.3|java2-runtime,java-common, libxalan2-java, libbsf-java
+Depends: j2re1.4 | j2re1.3 | java2-runtime, java-common, libxalan2-java, libbsf-java
+Suggests: rhino
 Description: xml.apache.org SVG Library
  Batik is the Apache Project's SVG Library. SVG stands for "Scalable Vector
  Graphics".
--- /cvsroot/pkg-java/batik/debian/copyright	2003/10/27 12:47:50	1.1.1.1
+++ /cvsroot/pkg-java/batik/debian/copyright	2005/03/21 15:11:59	1.2
@@ -2,7 +2,7 @@
 Tue, 11 Jun 2002 10:52:34 -0400.
 
 It was downloaded from:
-        http://xml.apache.org/batik/dist/
+        http://xml.apache.org/batik
 
  ============================================================================
                    The Apache Software License, Version 1.1
--- /cvsroot/pkg-java/batik/debian/libbatik-java.README.Debian	2003/10/27 12:47:50	1.1.1.1
+++ /cvsroot/pkg-java/batik/debian/libbatik-java.README.Debian	2005/03/21 15:11:59	1.2
@@ -3,3 +3,7 @@
 batik.jar     (full library)
 batik-ext.jar (batik dom and sax bindings)
 batik-all.jar (batik without dom and sax bindings)
+
+The batik library currently needs a SUN JDK 1.4 for compilation 
+as it requires several swing stuff and DOM Level 2 interface 
+classes (org.w3c.dom) to compile against.
--- /cvsroot/pkg-java/batik/debian/libbatik-java.install	2003/10/27 12:47:50	1.1.1.1
+++ /cvsroot/pkg-java/batik/debian/libbatik-java.install	2005/03/21 15:11:59	1.2
@@ -1 +1 @@
-batik-1.5/lib/*jar usr/share/java
+batik-1.5.1/lib/*jar usr/share/java
--- /cvsroot/pkg-java/batik/debian/rules	2004/02/12 14:08:56	1.2
+++ /cvsroot/pkg-java/batik/debian/rules	2005/03/21 15:11:59	1.3
@@ -7,18 +7,21 @@
 # This is the debhelper compatibility version to use.
 #export DH_COMPAT=4
 
+export JITC_PROCESSOR_TYPE=6
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME_DIRS       := /usr/local/IBMJava2-ppc-141 /usr/lib/j2se/1.4 /usr/lib/j2se/1.3 
-ANT_HOME             := /usr/share/ant
-DEB_JARS             := bfs gnujaxp xalan2
-DEB_ANT_COMPILER     := jikes
+JAVA_HOME_DIRS       := /usr/local/IBMJava2-ppc-141 /usr/local/IBMJava2-ppc-142 /usr/lib/j2sdk1.4-sun /usr/lib/j2se/1.4 /usr/lib/j2se/1.3 
+ANT_HOME             := /usr/share/ant1.6
+DEB_JARS             := /usr/share/ant1.6/lib/ant-launcher.jar bfs gnujaxp js xalan2
+#DEB_ANT_COMPILER     := jikes
+DEB_ANT_COMPILER     := modern
 DEB_ANT_BUILD_TARGET := all-jar libs-jar ext-jar
 DEB_BUILDDIR         := .
 DEB_ANT_BUILDFILE    := build.xml
 DEB_ANT_CLEAN_TARGET := clean
 
 LIBRARY=batik
-VERSION=1.5final
+VERSION=1.5.1