r2178 - tzdata/trunk/debian
Author: aurel32
Date: 2007-05-05 12:53:30 +0000 (Sat, 05 May 2007)
New Revision: 2178
Modified:
tzdata/trunk/debian/changelog
tzdata/trunk/debian/config
Log:
* debian/config: verify that /etc/localtime symlink points to a file
in /usr/share/zoneinfo (closes: bug#421280).
Modified: tzdata/trunk/debian/changelog
===================================================================
--- tzdata/trunk/debian/changelog 2007-05-05 11:53:11 UTC (rev 2177)
+++ tzdata/trunk/debian/changelog 2007-05-05 12:53:30 UTC (rev 2178)
@@ -1,13 +1,15 @@
tzdata (2007e-7) unstable; urgency=low
- * debian/po/en.po: fixes two typo. Thanks to Thijs Kinkhorst (closes:
+ * debian/po/en.po: fixes two typos. Thanks to Thijs Kinkhorst (closes:
#421889).
* New Russian debconf translation, by Yuri Kozlov (closes: bug#421499).
* New Portuguese debconf translation, by Rui Branco (closes: bug#422329).
- * Partly merge patch from the Debconf templates review (closes:
+ * Partly merge patch from the Debconf templates review (closes:
bug#422186).
+ * debian/config: verify that /etc/localtime symlink points to a file
+ in /usr/share/zoneinfo (closes: bug#421280).
- -- Aurelien Jarno <aurel32@debian.org> Sat, 05 May 2007 13:52:54 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Sat, 05 May 2007 05:52:04 -0700
tzdata (2007e-6) unstable; urgency=low
Modified: tzdata/trunk/debian/config
===================================================================
--- tzdata/trunk/debian/config 2007-05-05 11:53:11 UTC (rev 2177)
+++ tzdata/trunk/debian/config 2007-05-05 12:53:30 UTC (rev 2178)
@@ -257,7 +257,11 @@
# Read /etc/localtime
if [ -L /etc/localtime ] ; then
TZ_LOCALTIME="$(readlink /etc/localtime | sed 's%^/usr/share/zoneinfo/%%')"
- TZ_LOCALTIME="$(convert_timezone $TZ_LOCALTIME)"
+ if [ -f "/usr/share/zoneinfo/$TZ_LOCALTIME" ] ; then
+ TZ_LOCALTIME="$(convert_timezone $TZ_LOCALTIME)"
+ else
+ TZ_LOCALTIME=""
+ fi
elif [ -f /etc/localtime ] && [ -n "$TZ_TIMEZONE" ] ; then
if cmp -s /etc/localtime /usr/share/zoneinfo/$TZ_TIMEZONE ; then
TZ_LOCALTIME=$TZ_TIMEZONE
Reply to: