Author: adconrad Date: 2013-12-16 09:29:00 +0000 (Mon, 16 Dec 2013) New Revision: 5886
Modified: tzdata/trunk/debian/changelog tzdata/trunk/debian/control tzdata/trunk/debian/rules Log: Switch to default-jre-headless (closes: #732233) Modified: tzdata/trunk/debian/changelog =================================================================== --- tzdata/trunk/debian/changelog 2013-12-15 11:23:07 UTC (rev 5885) +++ tzdata/trunk/debian/changelog 2013-12-16 09:29:00 UTC (rev 5886) @@ -1,3 +1,9 @@ +tzdata (2013h-2) UNRELEASED; urgency=medium + + * Switch to default-jre-headless (closes: #732233) + + -- Adam Conrad <[email protected]> Mon, 16 Dec 2013 02:20:13 -0700 + tzdata (2013h-1) unstable; urgency=low * New upstream version. Modified: tzdata/trunk/debian/control =================================================================== --- tzdata/trunk/debian/control 2013-12-15 11:23:07 UTC (rev 5885) +++ tzdata/trunk/debian/control 2013-12-16 09:29:00 UTC (rev 5886) @@ -2,7 +2,7 @@ Section: libs Priority: required Build-Depends: debhelper (>= 5.0.0) -Build-Depends-Indep: po-debconf, openjdk-6-jre-headless, rdfind, symlinks +Build-Depends-Indep: po-debconf, default-jre-headless, rdfind, symlinks Maintainer: GNU Libc Maintainers <[email protected]> Uploaders: Clint Adams <[email protected]>, Aurelien Jarno <[email protected]> Standards-Version: 3.9.4 Modified: tzdata/trunk/debian/rules =================================================================== --- tzdata/trunk/debian/rules 2013-12-15 11:23:07 UTC (rev 5885) +++ tzdata/trunk/debian/rules 2013-12-16 09:29:00 UTC (rev 5886) @@ -12,7 +12,7 @@ VERSION := $(shell dpkg-parsechangelog | sed -e '/^Version/!d;s/^Version: //g;s/.*://g;s/-.*//g') EMDEBIAN := $(shell dpkg-parsechangelog | egrep '^Version: .*em[0-9]+') -JHOME := $(wildcard /usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH)/ /usr/lib/jvm/java-6-openjdk/) +JHOME := /usr/lib/jvm/default-java/ TIMEZONES := africa \ antarctica \ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
