r2223 - trunk/ant/debian

[Michael Koch]

Author: mkoch
Date: 2006-07-01 11:47:23 +0000 (Sat, 01 Jul 2006)
New Revision: 2223

Modified:
   trunk/ant/debian/changelog
   trunk/ant/debian/control
   trunk/ant/debian/rules
Log:
ant (1.6.5-6) unstable; urgency=low

  * debian/patches/03_SplashTaskPatch_a.patch: Fixed to apply the new file
    into the correct directory (Closes: #375540).
  * debian/rules: Build with java-gcj-compat.
  * debian/control: (Build-)Depends on java-gcj-compat(-dev).
  * debian/control: Moved cdbs and debhelper to Build-Depends.
  * debian/control: Updated Standards-Version to 3.7.2.
  * debian/control: Added myself to Uploaders.

 -- Michael Koch <konqueror at gmx.de>  Sat,  1 Jul 2006 10:51:26 +0000



Modified: trunk/ant/debian/changelog
===================================================================
--- trunk/ant/debian/changelog	2006-07-01 10:40:20 UTC (rev 2222)
+++ trunk/ant/debian/changelog	2006-07-01 11:47:23 UTC (rev 2223)
@@ -1,3 +1,15 @@
+ant (1.6.5-6) unstable; urgency=low
+
+  * debian/patches/03_SplashTaskPatch_a.patch: Fixed to apply the new file
+    into the correct directory (Closes: #375540).
+  * debian/rules: Build with java-gcj-compat.
+  * debian/control: (Build-)Depends on java-gcj-compat(-dev).
+  * debian/control: Moved cdbs and debhelper to Build-Depends.
+  * debian/control: Updated Standards-Version to 3.7.2.
+  * debian/control: Added myself to Uploaders.
+
+ -- Michael Koch <konqueror at gmx.de>  Sat,  1 Jul 2006 10:51:26 +0000
+
 ant (1.6.5-5) unstable; urgency=low
 
   * Added versioned build dependency on kaffe to fix the bootstrap process 

Modified: trunk/ant/debian/control
===================================================================
--- trunk/ant/debian/control	2006-07-01 10:40:20 UTC (rev 2222)
+++ trunk/ant/debian/control	2006-07-01 11:47:23 UTC (rev 2223)
@@ -2,15 +2,16 @@
 Section: devel
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: cdbs (>= 0.4.8), debhelper (>= 4.2.0), kaffe (>= 2:1.1.6.91-1), libxerces2-java, libbsf-java (>= 2.3.0rc1-1), liboro-java, libxalan2-java (>= 2.4.0-1), junit, antlr, liblog4j1.2-java, libregexp-java, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java
-Standards-Version: 3.6.2
+Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>, Michael Koch <konqueror at gmx.de>
+Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.2.0)
+Build-Depends-Indep: java-gcj-compat-dev, libxerces2-java, libbsf-java (>= 2.3.0rc1-1), liboro-java, libxalan2-java (>= 2.4.0-1), junit, antlr, liblog4j1.2-java, libregexp-java, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java
+Standards-Version: 3.7.2
 
 Package: ant
 Architecture: all
 Section: devel
 Priority: optional
-Depends: kaffe | java-virtual-machine, kaffe | java1-runtime | java2-runtime, libxerces2-java
+Depends: java-gcj-compat | java-virtual-machine, java-gcj-compat | java1-runtime | java2-runtime, libxerces2-java
 Recommends: ant-optional, jikes | java-compiler
 Suggests: ant-doc 
 Conflicts: libant1.6-java, ant-doc (<= 1.6.5-1)
@@ -26,7 +27,7 @@
 Architecture: all
 Section: devel
 Priority: optional
-Depends: kaffe | java1-runtime | java2-runtime, ant (= ${Source-Version})
+Depends: java-gcj-compat | java1-runtime | java2-runtime, ant (= ${Source-Version})
 Suggests: libbsf-java, liboro-java, libxalan2-java (>= 2.4.0-1), junit, liblog4j1.2-java, libregexp-java, jython, antlr, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java, javacc
 Conflicts: libant1.6-java
 Replaces: libant1.6-java

Modified: trunk/ant/debian/rules
===================================================================
--- trunk/ant/debian/rules	2006-07-01 10:40:20 UTC (rev 2222)
+++ trunk/ant/debian/rules	2006-07-01 11:47:23 UTC (rev 2223)
@@ -7,11 +7,11 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 # needs to be exported for direct ant call
-export JAVA_HOME := /usr/lib/kaffe
+export JAVA_HOME := /usr/lib/jvm/java-gcj
 # needed for bootstrap.sh
-export JAVAC=/usr/bin/ecj
+export JAVAC=$(JAVA_HOME)/bin/javac
 # needed for bootstrap
-export BOOTJAVAC_OPTS=-bootclasspath /usr/lib/kaffe/jre/lib/rt.jar -source 1.3 -target 1.3 -nowarn
+export BOOTJAVAC_OPTS=-source 1.3 -target 1.3 -nowarn
 # needed for building with bootstrap ant
 export ANT_HOME := bootstrap