[junit] 17/37: * (Build-)depend on default-jre/-jdk (>= 1.4). * Build with -target 1.4.

[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 5b158ca53c4ee3d65cb3e699e0c00d62e9864c0b
Author: Matthias Klose <doko at debian.org>
Date:   Mon Oct 20 12:36:52 2008 +0000

      * (Build-)depend on default-jre/-jdk (>= 1.4).
      * Build with -target 1.4.
---
 debian/changelog | 6 +++---
 debian/control   | 2 +-
 debian/rules     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3f773a6..bf39219 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
 junit (3.8.2-2) UNRELEASED; urgency=low
 
-  * (Build-)depend on default-jre/-jdk.
-  * Don't build with -target 1.3.
+  * (Build-)depend on default-jre/-jdk (>= 1.4).
+  * Build with -target 1.4.
 
- -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 15:32:08 +0000
+ -- Matthias Klose <doko at debian.org>  Mon, 20 Oct 2008 12:37:05 +0000
 
 junit (3.8.2-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 35f3eab..1dd169e 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Homepage: http://www.junit.org
 
 Package: junit
 Architecture: all
-Depends: default-jre | java1-runtime | java2-runtime
+Depends: default-jre (>= 1.4) | default-jre-headless (>= 1.4) | java2-runtime | java2-runtime-headless
 Suggests: junit-doc
 Enhances: ant-optional
 Description: Automated testing framework for Java
diff --git a/debian/rules b/debian/rules
index 6b6b5bc..296cb3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ build:
 	patch -p0 < debian/TestCollector.java.diff
 
 	mkdir -p classes
-	(cd src;${JAVAC} -classpath ${CLASSPATH} -d ../classes junit/*/*.java)
+	(cd src;${JAVAC} -source 1.4 -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