[pkg-java] r7178 - trunk/junit/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-10-20 12:36:52 +0000 (Mon, 20 Oct 2008)
New Revision: 7178

Modified:
   trunk/junit/debian/changelog
   trunk/junit/debian/control
   trunk/junit/debian/rules
Log:
  * (Build-)depend on default-jre/-jdk (>= 1.4).
  * Build with -target 1.4.


Modified: trunk/junit/debian/changelog
===================================================================
--- trunk/junit/debian/changelog	2008-10-20 11:56:58 UTC (rev 7177)
+++ trunk/junit/debian/changelog	2008-10-20 12:36:52 UTC (rev 7178)
@@ -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
 

Modified: trunk/junit/debian/control
===================================================================
--- trunk/junit/debian/control	2008-10-20 11:56:58 UTC (rev 7177)
+++ trunk/junit/debian/control	2008-10-20 12:36:52 UTC (rev 7178)
@@ -12,7 +12,7 @@
 
 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

Modified: trunk/junit/debian/rules
===================================================================
--- trunk/junit/debian/rules	2008-10-20 11:56:58 UTC (rev 7177)
+++ trunk/junit/debian/rules	2008-10-20 12:36:52 UTC (rev 7178)
@@ -21,7 +21,7 @@
 	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