Author: doko Date: 2008-07-30 15:37:26 +0000 (Wed, 30 Jul 2008) New Revision: 6780
Modified: trunk/junit/debian/changelog trunk/junit/debian/control trunk/junit/debian/rules Log: * (Build-)depend on default-jre/-jdk. * Don't build with -target 1.3. Modified: trunk/junit/debian/changelog =================================================================== --- trunk/junit/debian/changelog 2008-07-30 15:31:48 UTC (rev 6779) +++ trunk/junit/debian/changelog 2008-07-30 15:37:26 UTC (rev 6780) @@ -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 <[EMAIL PROTECTED]> Wed, 30 Jul 2008 15:32:08 +0000 + junit (3.8.2-1) unstable; urgency=low [ Kumar Appaiah ] Modified: trunk/junit/debian/control =================================================================== --- trunk/junit/debian/control 2008-07-30 15:31:48 UTC (rev 6779) +++ trunk/junit/debian/control 2008-07-30 15:37:26 UTC (rev 6780) @@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]> Uploaders: Michael Koch <[EMAIL PROTECTED]>, Wolfgang Baer <[EMAIL PROTECTED]> 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 @@ 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 Modified: trunk/junit/debian/rules =================================================================== --- trunk/junit/debian/rules 2008-07-30 15:31:48 UTC (rev 6779) +++ trunk/junit/debian/rules 2008-07-30 15:37:26 UTC (rev 6780) @@ -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 @@ 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 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits

