[junit] 16/37: * (Build-)depend on default-jre/-jdk. * Don't build with -target 1.3.

[Emmanuel Bourg]

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

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

commit cc3564f1f66e890bd8c5f0b66914cbe0475045ee
Author: Matthias Klose <doko at debian.org>
Date:   Wed Jul 30 15:37:26 2008 +0000

      * (Build-)depend on default-jre/-jdk.
      * Don't build with -target 1.3.
---
 debian/changelog | 7 +++++++
 debian/control   | 4 ++--
 debian/rules     | 5 +++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0626e4d..3f773a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+junit (3.8.2-2) UNRELEASED; urgency=low
+
+  * (Build-)depend on default-jre/-jdk.
+  * Don't build with -target 1.3.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 15:32:08 +0000
+
 junit (3.8.2-1) unstable; urgency=low
 
   [ Kumar Appaiah ]
diff --git a/debian/control b/debian/control
index fd1ef95..35f3eab 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,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: debhelper (>= 4.2.30), cdbs
-Build-Depends-Indep: java-gcj-compat-dev
+Build-Depends-Indep: default-jdk
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/junit
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/junit
@@ -12,7 +12,7 @@ Homepage: http://www.junit.org
 
 Package: junit
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: default-jre | java1-runtime | java2-runtime
 Suggests: junit-doc
 Enhances: ant-optional
 Description: Automated testing framework for Java
diff --git a/debian/rules b/debian/rules
index 0b9c937..6b6b5bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-JAVA_HOME	:= /usr/lib/jvm/java-gcj
+JAVA_HOME	:= /usr/lib/jvm/default-java
 
 JAVAC 		= $(JAVA_HOME)/bin/javac
 JAR		= $(JAVA_HOME)/bin/jar
@@ -20,7 +20,8 @@ build:
 	patch -p0 < debian/AboutDialog.java.diff
 	patch -p0 < debian/TestCollector.java.diff
 
-	(cd src;${JAVAC} -target 1.3 -classpath ${CLASSPATH} -d ../classes junit/*/*.java)
+	mkdir -p classes
+	(cd src;${JAVAC} -classpath ${CLASSPATH} -d ../classes junit/*/*.java)
 	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

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