CVS pja/debian

[Arnaud Vandyck]

Update of /cvsroot/pkg-java/pja/debian
In directory haydn:/tmp/cvs-serv28651/debian

Modified Files:
	changelog control rules 
Log Message:
added jikes and changed the jdk dirs

--- /cvsroot/pkg-java/pja/debian/changelog	2005/04/15 09:54:49	1.4
+++ /cvsroot/pkg-java/pja/debian/changelog	2005/04/27 21:14:07	1.5
@@ -1,8 +1,10 @@
 pja (2.5-3) unstable; urgency=low
 
-  * moved PJAFontCapture.sh patch from diff.gz to debian/patches
+  * debian/control: added jikes, thanks to Andreas Jochens (closes:
+    #306596).
+  * debian/rules: added JDK directories created by java-package.
 
- --
+ -- Arnaud Vandyck <avdyk@debian.org>  Wed, 27 Apr 2005 23:01:29 +0200
 
 pja (2.5-2) unstable; urgency=low
 
--- /cvsroot/pkg-java/pja/debian/control	2005/04/15 09:47:22	1.3
+++ /cvsroot/pkg-java/pja/debian/control	2005/04/27 21:14:07	1.4
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Takashi Okamoto <tora@debian.org>, Arnaud Vandyck <avdyk@debian.org>
-Build-Depends-Indep: debhelper (>= 4.0.0), cdbs, libant1.6-java, j2sdk1.4 | j2sdk1.3 | j2sdk1.2, libservlet2.3-java
+Build-Depends-Indep: debhelper (>= 4.0.0), cdbs, libant1.6-java, j2sdk1.4, jikes, libservlet2.3-java
 Standards-Version: 3.6.1
 
 Package: libpja-java
--- /cvsroot/pkg-java/pja/debian/rules	2005/04/14 11:00:57	1.2
+++ /cvsroot/pkg-java/pja/debian/rules	2005/04/27 21:14:07	1.3
@@ -8,7 +8,7 @@
 
 export JITC_PROCESSOR_TYPE=6
 
-JAVA_HOME_DIRS := /usr/lib/j2se/1.4 /usr/lib/kaffe
+JAVA_HOME_DIRS := /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.4-blackdown /usr/lib/kaffe
 ANT_HOME := /usr/share/ant1.6
 DEB_JARS := /usr/share/ant1.6/lib/ant-launcher.jar servlet-2.3.jar
 DEB_ANT_COMPILER := jikes