r4935 - tzdata/trunk/debian
Author: aurel32
Date: 2011-09-04 15:01:53 +0000 (Sun, 04 Sep 2011)
New Revision: 4935
Modified:
tzdata/trunk/debian/changelog
tzdata/trunk/debian/rules
Log:
* OpenJDK-6 changed the path to the java binary without warning. Try both
the old and the new path, to avoid adding a versioned dependency on
openjdk-6-jre-headless that would prevent migration to testing. Closes:
#640276.
Modified: tzdata/trunk/debian/changelog
===================================================================
--- tzdata/trunk/debian/changelog 2011-09-04 14:06:29 UTC (rev 4934)
+++ tzdata/trunk/debian/changelog 2011-09-04 15:01:53 UTC (rev 4935)
@@ -1,9 +1,15 @@
tzdata (2011i-2) UNRELEASED; urgency=low
+ [ Aurelien Jarno ]
+ * OpenJDK-6 changed the path to the java binary without warning. Try both
+ the old and the new path, to avoid adding a versioned dependency on
+ openjdk-6-jre-headless that would prevent migration to testing. Closes:
+ #640276.
+
[ Debconf translations ]
* French updated (Christian Perrier)
- -- Christian Perrier <bubulle@debian.org> Sat, 03 Sep 2011 08:07:34 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 04 Sep 2011 16:46:50 +0200
tzdata (2011i-1) unstable; urgency=low
Modified: tzdata/trunk/debian/rules
===================================================================
--- tzdata/trunk/debian/rules 2011-09-04 14:06:29 UTC (rev 4934)
+++ tzdata/trunk/debian/rules 2011-09-04 15:01:53 UTC (rev 4935)
@@ -4,13 +4,15 @@
#export DH_VERBOSE=1
export LC_ALL=C
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
TZGEN := $(CURDIR)/tzgen
TZGEN_JAVA := $(CURDIR)/tzgen-java
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 := /usr/lib/jvm/java-6-openjdk
+JHOME := $(wildcard /usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH)/ /usr/lib/jvm/java-6-openjdk/)
TIMEZONES := africa \
antarctica \
Reply to: