r2318 - trunk/libjaxp1.3-java/debian

[Arnaud Vandyck]

Author: avdyk
Date: 2006-08-03 08:31:24 +0000 (Thu, 03 Aug 2006)
New Revision: 2318

Modified:
   trunk/libjaxp1.3-java/debian/changelog
   trunk/libjaxp1.3-java/debian/rules
Log:
libjaxp1.3-java (1.3.03-4) unstable; urgency=low

  * debian/rules: using /usr/lib/jvm/java-gcj/bin/javac to build, not gcj
    (closes: #379530)

 -- Arnaud Vandyck <avdyk at debian.org>  Thu,  3 Aug 2006 10:30:58 +0200

Modified: trunk/libjaxp1.3-java/debian/changelog
===================================================================
--- trunk/libjaxp1.3-java/debian/changelog	2006-08-02 22:24:43 UTC (rev 2317)
+++ trunk/libjaxp1.3-java/debian/changelog	2006-08-03 08:31:24 UTC (rev 2318)
@@ -1,3 +1,10 @@
+libjaxp1.3-java (1.3.03-4) unstable; urgency=low
+
+  * debian/rules: using /usr/lib/jvm/java-gcj/bin/javac to build, not gcj
+    (closes: #379530)
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Thu,  3 Aug 2006 10:30:58 +0200
+
 libjaxp1.3-java (1.3.03-3) unstable; urgency=low
 
   * debian/control: I am the uploader, not Stefan.

Modified: trunk/libjaxp1.3-java/debian/rules
===================================================================
--- trunk/libjaxp1.3-java/debian/rules	2006-08-02 22:24:43 UTC (rev 2317)
+++ trunk/libjaxp1.3-java/debian/rules	2006-08-03 08:31:24 UTC (rev 2318)
@@ -3,6 +3,8 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 
+JAVA_HOME := /usr/lib/jvm/java-gcj
+
 clean::
 	rm -rf build debian/build-stamp
 
@@ -11,9 +13,9 @@
 	mkdir -p build/license
 
 	# An alternative would be to build the classes using GCJ
-	gcj -C -O2 -d build `find javax org -name \*.java`
-	#jikes -bootclasspath /usr/share/classpath/glibj.zip -d build `find javax org -name \*.java`
+	$(JAVA_HOME)/bin/javac -d build `find javax org -name \*.java`
 	cp LICENSE.*.txt README.*.txt build/license
-	cd build && jar -c -m ../manifest.commons -f jaxp-1.3.jar javax license org
+	cd build && $(JAVA_HOME)/bin/jar -c -m ../manifest.commons \
+		-f jaxp-1.3.jar javax license org
 	touch debian/build-stamp