[bsh] 07/50: bsh (2.0b4-4) unstable; urgency=low

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository bsh.

commit c2c3072ac27f5bed9c296ade5a01d31683632549
Author: Arnaud Vandyck <avdyk at debian.org>
Date:   Tue Jun 6 10:02:37 2006 +0000

    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
---
 debian/changelog |  3 ++-
 debian/control   |  2 +-
 debian/rules     | 12 ++++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5fc8359..1528ebc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ 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 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
 
diff --git a/debian/control b/debian/control
index 8915d94..0de7d56 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 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
diff --git a/debian/rules b/debian/rules
index 83d1f5d..808f074 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 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 @@ DEB_ANT_BUILD_TARGET := javadoc jarall test
 
 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bsh.git