r2190 - trunk/bsh/debian

[Arnaud Vandyck]

Author: avdyk
Date: 2006-06-06 10:02:37 +0000 (Tue, 06 Jun 2006)
New Revision: 2190

Modified:
   trunk/bsh/debian/changelog
   trunk/bsh/debian/control
   trunk/bsh/debian/rules
Log:
bsh (2.0b4-4) unstable; urgency=low

  * depends on java-gcj-compat (closes: #370411)
  * updated Standards Version to 3.7.2, nothing to do.
  * build with java-gcj-compat, kaffe removed from build-dep.

 -- Arnaud Vandyck <avdyk at debian.org>  Tue,  6 Jun 2006 09:41:10 +0000

Modified: trunk/bsh/debian/changelog
===================================================================
--- trunk/bsh/debian/changelog	2006-06-06 08:21:34 UTC (rev 2189)
+++ trunk/bsh/debian/changelog	2006-06-06 10:02:37 UTC (rev 2190)
@@ -2,8 +2,9 @@
 
   * depends on java-gcj-compat (closes: #370411)
   * updated Standards Version to 3.7.2, nothing to do.
+  * build with java-gcj-compat, kaffe removed from build-dep.
 
- -- Arnaud Vandyck <avdyk at debian.org>  Tue,  6 Jun 2006 08:21:14 +0000
+ -- Arnaud Vandyck <avdyk at debian.org>  Tue,  6 Jun 2006 09:41:10 +0000
 
 bsh (2.0b4-3) unstable; urgency=low
 

Modified: trunk/bsh/debian/control
===================================================================
--- trunk/bsh/debian/control	2006-06-06 08:21:34 UTC (rev 2189)
+++ trunk/bsh/debian/control	2006-06-06 10:02:37 UTC (rev 2190)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, kaffe (>= 2:1.1.5-1), ant, libservlet2.3-java, libbsf-java, javacc, lynx
+Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, java-gcj-compat-dev, ant, libservlet2.3-java, libbsf-java, javacc, lynx
 Standards-Version: 3.7.2
 
 Package: bsh

Modified: trunk/bsh/debian/rules
===================================================================
--- trunk/bsh/debian/rules	2006-06-06 08:21:34 UTC (rev 2189)
+++ trunk/bsh/debian/rules	2006-06-06 10:02:37 UTC (rev 2190)
@@ -7,7 +7,8 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME := /usr/lib/kaffe
+JAVA_HOME := /usr/lib/jvm/java-gcj
+#/usr/lib/kaffe
 ANT_HOME := /usr/share/ant
 
 DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar servlet-2.3 bsf javacc
@@ -15,9 +16,12 @@
 
 clean::
 	# remove tests which also fail with SUN JDK 1.4
-	rm -f tests/test-scripts/accessibility.bsh tests/test-scripts/class13.bsh tests/test-scripts/class3.bsh \
-	tests/test-scripts/classinterf1.bsh tests/test-scripts/strings.bsh
-	
+	rm -f tests/test-scripts/accessibility.bsh \
+				tests/test-scripts/class13.bsh \
+				tests/test-scripts/class3.bsh \
+				tests/test-scripts/classinterf1.bsh \
+				tests/test-scripts/strings.bsh
+
 install/bsh::
 	install -m 644 dist/bsh-$(UPSTREAM_VERSION).jar debian/bsh/usr/share/java/bsh-$(UPSTREAM_VERSION).jar
 	ln -s bsh-$(UPSTREAM_VERSION).jar debian/bsh/usr/share/java/bsh.jar