[pkg-java] r3190 - trunk/pja/debian

[Arnaud Vandyck]

Author: avdyk
Date: 2007-04-13 07:46:43 +0000 (Fri, 13 Apr 2007)
New Revision: 3190

Modified:
   trunk/pja/debian/changelog
   trunk/pja/debian/control
   trunk/pja/debian/rules
Log:
pja (2.5-4) unstable; urgency=low

  * ant transition
  * serlet updated to servlet2.4
  * Standards-Version updated to 3.6.2

 -- Arnaud Vandyck <avdyk at debian.org>  Mon, 10 Oct 2005 17:38:09 +0200

Modified: trunk/pja/debian/changelog
===================================================================
--- trunk/pja/debian/changelog	2007-04-13 07:21:54 UTC (rev 3189)
+++ trunk/pja/debian/changelog	2007-04-13 07:46:43 UTC (rev 3190)
@@ -1,3 +1,11 @@
+pja (2.5-4) unstable; urgency=low
+
+  * ant transition
+  * serlet updated to servlet2.4
+  * Standards-Version updated to 3.6.2
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Mon, 10 Oct 2005 17:38:09 +0200
+
 pja (2.5-3) unstable; urgency=low
 
   * debian/control: added jikes, thanks to Andreas Jochens (closes:

Modified: trunk/pja/debian/control
===================================================================
--- trunk/pja/debian/control	2007-04-13 07:21:54 UTC (rev 3189)
+++ trunk/pja/debian/control	2007-04-13 07:46:43 UTC (rev 3190)
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Takashi Okamoto <tora at debian.org>, Arnaud Vandyck <avdyk at debian.org>
-Build-Depends-Indep: debhelper (>= 4.0.0), cdbs, libant1.6-java, j2sdk1.4, jikes, libservlet2.3-java
-Standards-Version: 3.6.1
+Build-Depends-Indep: debhelper (>= 4.0.0), cdbs, ant, j2sdk1.4, jikes, libservlet2.4-java
+Standards-Version: 3.6.2
 
 Package: libpja-java
 Architecture: all
-Depends: kaffe (>= 1.0.7) | java1-runtime | java2-runtime, libservlet2.3-java
+Depends: kaffe (>= 1.0.7) | java1-runtime | java2-runtime, libservlet2.3-java | libservlet2.4-java
 Description: 100% Pure Java AWT Toolkit which works without X Server.
  PJA (Pure Java AWT) is 100% Pure Java and doesn't use any native
  graphics resource of the system on which the Java Virtual Machine

Modified: trunk/pja/debian/rules
===================================================================
--- trunk/pja/debian/rules	2007-04-13 07:21:54 UTC (rev 3189)
+++ trunk/pja/debian/rules	2007-04-13 07:46:43 UTC (rev 3190)
@@ -8,9 +8,9 @@
 
 export JITC_PROCESSOR_TYPE=6
 
-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
+JAVA_HOME_DIRS := /usr/local/IBMJava2-ppc-142 /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/ant
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar servlet-api-2.4.jar
 DEB_ANT_COMPILER := jikes
 DEB_ANT_PROPERTYFILE := debian/build.properties
 DEB_ANT_BUILDFILE := debian/build.xml
@@ -25,8 +25,7 @@
 # Building uses the default target from build.xml, installing and testing is
 # only called if the corresponding variable is set. You can also specify
 # multiple targets for each step.
-DEB_ANT_BUILD_TARGET   := compile
-DEB_ANT_INSTALL_TARGET := dist
+DEB_ANT_BUILD_TARGET   := dist
 #DEB_ANT_TEST_TARGET    :=
 
 # This example assumes that Ant creates a JAR in dist which should be installed