r2350 - tzdata/trunk/debian

[schizo@alioth.debian.org]

Author: schizo
Date: 2007-06-03 23:10:05 +0000 (Sun, 03 Jun 2007)
New Revision: 2350

Modified:
   tzdata/trunk/debian/changelog
   tzdata/trunk/debian/config
Log:
  * debian/config: reverse the division of area/zone given the hack
    for the 3-level zones in America/ . closes: #427389.


Modified: tzdata/trunk/debian/changelog
===================================================================
--- tzdata/trunk/debian/changelog	2007-06-03 19:36:43 UTC (rev 2349)
+++ tzdata/trunk/debian/changelog	2007-06-03 23:10:05 UTC (rev 2350)
@@ -1,3 +1,10 @@
+tzdata (2007f-8) unstable; urgency=high
+
+  * debian/config: reverse the division of area/zone given the hack
+    for the 3-level zones in America/ . closes: #427389.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 03 Jun 2007 19:00:32 -0400
+
 tzdata (2007f-7) unstable; urgency=medium
 
   * debian/po/fr.po: update from Christian Perrier.

Modified: tzdata/trunk/debian/config
===================================================================
--- tzdata/trunk/debian/config	2007-06-03 19:36:43 UTC (rev 2349)
+++ tzdata/trunk/debian/config	2007-06-03 23:10:05 UTC (rev 2350)
@@ -341,8 +341,8 @@
 # The timezone has never been configured or is falsely configured
 if ! [ -e /etc/localtime ] ; then
     if [ -n "$TZ_TIMEZONE" ] ; then
-        AREA="${TZ_LOCALTIME%/*}"
-        ZONE="${TZ_LOCALTIME##*/}"
+        AREA="${TZ_LOCALTIME%%/*}"
+        ZONE="${TZ_LOCALTIME#*/}"
     else
         AREA="Etc"
 	ZONE="UTC"
@@ -360,8 +360,8 @@
     fi
 # The timezone has already been configured
 else
-    AREA="${TZ_LOCALTIME%/*}"
-    ZONE="${TZ_LOCALTIME##*/}"
+    AREA="${TZ_LOCALTIME%%/*}"
+    ZONE="${TZ_LOCALTIME#*/}"
     # Don't ask the user, except if he/she explicitely asked that
     if [ "$1" != "reconfigure" ] && [ -z "$DEBCONF_RECONFIGURE" ] ; then
         db_fset tzdata/Areas seen true