r1734 - trunk/junit/debian

[Wolfgang Bär]

Author: wbaer-guest
Date: 2006-01-23 13:28:55 +0000 (Mon, 23 Jan 2006)
New Revision: 1734

Modified:
   trunk/junit/debian/changelog
   trunk/junit/debian/control
   trunk/junit/debian/rules
Log:
Update to kaffe transition upload.

Modified: trunk/junit/debian/changelog
===================================================================
--- trunk/junit/debian/changelog	2006-01-23 13:27:38 UTC (rev 1733)
+++ trunk/junit/debian/changelog	2006-01-23 13:28:55 UTC (rev 1734)
@@ -1,3 +1,11 @@
+junit (3.8.1.1-6) unstable; urgency=low
+
+  * Removed explicit usage of jikes build compiler property
+    for kaffe jikes -> ecj transition
+  * Use kaffe's jar instead of fastjar - remove fastjar from build-deps
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Fri,  6 Jan 2006 19:38:06 +0100
+
 junit (3.8.1.1-5) unstable; urgency=low
 
   * Converted to cdbs (closes: #311045)

Modified: trunk/junit/debian/control
===================================================================
--- trunk/junit/debian/control	2006-01-23 13:27:38 UTC (rev 1733)
+++ trunk/junit/debian/control	2006-01-23 13:28:55 UTC (rev 1734)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Michael Koch <konqueror at gmx.de>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, kaffe (>= 2:1.1.5-3), fastjar
+Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, kaffe (>= 2:1.1.5-3)
 Standards-Version: 3.6.2
 
 Package: junit

Modified: trunk/junit/debian/rules
===================================================================
--- trunk/junit/debian/rules	2006-01-23 13:27:38 UTC (rev 1733)
+++ trunk/junit/debian/rules	2006-01-23 13:28:55 UTC (rev 1734)
@@ -6,15 +6,16 @@
 
 JAVA_HOME	:= /usr/lib/kaffe
 
-JAVAC 		= jikes
-CLASSPATH 	= .:/usr/share/kaffe-common/lib/rt.jar
-JAVADOC		= /usr/bin/gjdoc
+JAVAC 		= $(JAVA_HOME)/bin/javac
+JAR		= $(JAVA_HOME)/bin/jar
+CLASSPATH 	= .
+JAVADOC		= $(JAVA_HOME)/bin/javadoc
 JARNAME		= junit.jar
 
 UPSTREAM_VERSION=$(shell echo $(DEB_VERSION) | cut -d- -f1)
 
 build:
-	(mkdir src; cd src; fastjar xvf ../src.jar)
+	(mkdir src; cd src; ${JAR} xvf ../src.jar)
 	(rm  src/junit/swingui/*.java; cp debian/TestRunner.java src/junit/swingui)
 	patch -p0 < debian/AboutDialog.java.diff
 
@@ -22,7 +23,7 @@
 	cp -r src/junit/swingui/icons classes/junit/swingui
 	cp src/junit/runner/*.gif classes/junit/runner
 	cp src/junit/runner/excluded.properties classes/junit/runner
-	(fastjar cvf ${JARNAME} -C classes junit)
+	(${JAR} cvf ${JARNAME} -C classes junit)
 	# build the api with gjdoc
 	mkdir -p doc/api
 	(cd src;${JAVADOC} -d ../doc/api junit.framework junit.awtui junit.swingui junit.runner junit.textui junit.extensions)