r2521 - tzdata/trunk/debian
Author: aurel32
Date: 2007-08-24 23:13:23 +0000 (Fri, 24 Aug 2007)
New Revision: 2521
Removed:
tzdata/trunk/debian/preinst
Modified:
tzdata/trunk/debian/changelog
tzdata/trunk/debian/config
Log:
* debian/preinst: remove.
* debian/config: don't try to detect modified /etc/localtime file.
closes: #43844
Modified: tzdata/trunk/debian/changelog
===================================================================
--- tzdata/trunk/debian/changelog 2007-08-20 16:06:59 UTC (rev 2520)
+++ tzdata/trunk/debian/changelog 2007-08-24 23:13:23 UTC (rev 2521)
@@ -1,3 +1,11 @@
+tzdata (2007f-12) unstable; urgency=high
+
+ * debian/preinst: remove.
+ * debian/config: don't try to detect modified /etc/localtime file.
+ closes: #438449.
+
+ -- Aurelien Jarno <aurel32@debian.org> Sat, 25 Aug 2007 01:10:44 +0200
+
tzdata (2007f-11) unstable; urgency=high
* Urgency set to high as it fixes an RC bug.
Modified: tzdata/trunk/debian/config
===================================================================
--- tzdata/trunk/debian/config 2007-08-20 16:06:59 UTC (rev 2520)
+++ tzdata/trunk/debian/config 2007-08-24 23:13:23 UTC (rev 2521)
@@ -328,8 +328,12 @@
TIMEZONE="$(head -n 1 /etc/timezone)"
TIMEZONE="${TIMEZONE%% *}"
TIMEZONE="$(convert_timezone $TIMEZONE)"
- AREA="${TIMEZONE%%/*}"
- ZONE="${TIMEZONE#*/}"
+ if [ -f "/usr/share/zoneinfo/$TIMEZONE" ] ; then
+ AREA="${TIMEZONE%%/*}"
+ ZONE="${TIMEZONE#*/}"
+ else
+ rm -f /etc/timezone
+ fi
fi
# The timezone is already configured
@@ -341,7 +345,7 @@
fi
# The timezone has never been configured or is falsely configured
elif ! [ -e /etc/localtime ] || [ -n "$DEBCONF_RECONFIGURE" ] ; then
- if [ -z "$TIMEZONE" ] ; then
+ if [ -z "$AREA" ] || [ -z "$ZONE" ] ; then
AREA="Etc"
ZONE="UTC"
echo "Etc/UTC" > /etc/timezone
Deleted: tzdata/trunk/debian/preinst
===================================================================
--- tzdata/trunk/debian/preinst 2007-08-20 16:06:59 UTC (rev 2520)
+++ tzdata/trunk/debian/preinst 2007-08-24 23:13:23 UTC (rev 2521)
@@ -1,23 +0,0 @@
-#! /bin/sh
-set -e
-
-LC_ALL=C
-LANG=C
-
-
-if [ "$1" = upgrade ]; then
- # If /etc/localtime has been modified, /etc/timezone is
- # a nonsense, remove it.
- if [ -f /etc/localtime ] && ! [ -L /etc/localtime ] && [ -e /etc/timezone ] ; then
- TIMEZONE="$(head -n 1 /etc/timezone)"
- TIMEZONE="${TIMEZONE%% *}"
- if ! [ -f "/usr/share/zoneinfo/$TIMEZONE" ] || \
- ! cmp -s /etc/localtime /usr/share/zoneinfo/$TIMEZONE ; then
- rm -f /etc/timezone
- fi
- fi
-fi
-
-#DEBHELPER#
-
-exit 0
Reply to: