Author: ttx-guest Date: 2009-11-09 13:57:16 +0000 (Mon, 09 Nov 2009) New Revision: 11042
Modified: trunk/commons-daemon/debian/changelog trunk/commons-daemon/debian/control trunk/commons-daemon/debian/rules Log: * debian/control, debian/rules: Build with default-jdk * debian/rules: Depend on -headless runtimes * debian/rules: Set java source/target to 1.4 to match depends Modified: trunk/commons-daemon/debian/changelog =================================================================== --- trunk/commons-daemon/debian/changelog 2009-11-08 21:03:34 UTC (rev 11041) +++ trunk/commons-daemon/debian/changelog 2009-11-09 13:57:16 UTC (rev 11042) @@ -1,3 +1,11 @@ +commons-daemon (1.0.2~svn20061127-11) UNRELEASED; urgency=low + + * debian/control, debian/rules: Build with default-jdk + * debian/rules: Depend on -headless runtimes + * debian/rules: Set java source/target to 1.4 to match depends + + -- Thierry Carrez <[email protected]> Mon, 09 Nov 2009 14:42:28 +0100 + commons-daemon (1.0.2~svn20061127-10) unstable; urgency=low * Build-Depends on libcap2-dev (Closes: #506548). Modified: trunk/commons-daemon/debian/control =================================================================== --- trunk/commons-daemon/debian/control 2009-11-08 21:03:34 UTC (rev 11041) +++ trunk/commons-daemon/debian/control 2009-11-09 13:57:16 UTC (rev 11042) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Arnaud Vandyck <[email protected]>, Michael Koch <[email protected]>, Marcus Better <[email protected]> -Build-Depends: debhelper (>= 7), autoconf, autotools-dev, java-gcj-compat-dev, xsltproc, docbook-xsl, ant +Build-Depends: debhelper (>= 7), autoconf, autotools-dev, default-jdk, xsltproc, docbook-xsl, ant Build-Conflicts: autoconf2.13 Standards-Version: 3.8.3 Homepage: http://jakarta.apache.org/commons/daemon/ @@ -12,7 +12,7 @@ Package: libcommons-daemon-java Architecture: all -Depends: java-gcj-compat | java1-runtime | java2-runtime +Depends: default-jre-headless | java2-runtime-headless Suggests: java-virtual-machine Recommends: jsvc Description: library to launch Java applications as daemons Modified: trunk/commons-daemon/debian/rules =================================================================== --- trunk/commons-daemon/debian/rules 2009-11-08 21:03:34 UTC (rev 11041) +++ trunk/commons-daemon/debian/rules 2009-11-09 13:57:16 UTC (rev 11042) @@ -7,9 +7,10 @@ CFLAGS += -O2 endif -JAVA_HOME := /usr/lib/jvm/java-gcj +JAVA_HOME := /usr/lib/jvm/default-java DEB_JARS_BASE := /usr/share/java JAVACMD := $(JAVA_HOME)/bin/java +ANT_ARGS := -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 DEB_JARS := ant ant-launcher _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
