Author: schizo
Date: 2007-06-01 15:02:03 +0000 (Fri, 01 Jun 2007)
New Revision: 2326

Modified:
   tzdata/trunk/debian/changelog
   tzdata/trunk/debian/rules
Log:
Handle three-level timezones (including Argentina) in debconf selection.


Modified: tzdata/trunk/debian/changelog
===================================================================
--- tzdata/trunk/debian/changelog       2007-06-01 15:02:01 UTC (rev 2325)
+++ tzdata/trunk/debian/changelog       2007-06-01 15:02:03 UTC (rev 2326)
@@ -1,8 +1,8 @@
 tzdata (2007f-5) UNRELEASED; urgency=medium
 
-  * Handle Argentine timezones in debconf selection, as well as
-    converting Argentine compatibility zones to their three-level
-    counterparts.  closes: #426914 
+  * Handle three-level timezones (including Argentina) in debconf
+    selection, as well as converting Argentine compatibility zones
+    to their three-level counterparts.  closes: #426914.
   * debian/po/en.po: updates for "new" zones.
 
  -- Clint Adams <[EMAIL PROTECTED]>  Thu, 31 May 2007 14:21:48 -0400

Modified: tzdata/trunk/debian/rules
===================================================================
--- tzdata/trunk/debian/rules   2007-06-01 15:02:01 UTC (rev 2325)
+++ tzdata/trunk/debian/rules   2007-06-01 15:02:03 UTC (rev 2326)
@@ -96,10 +96,8 @@
                    echo -n "__Choices: " ; \
            fi ; \
            cd $(CURDIR)/tzgen/$$i ; \
-           find . -maxdepth 1 -type f | sed -e 's#^\./##' | \
-               egrep -v 
'^(Ashkhabad|Chungking|Dacca|Macao|Thimbu|Ulan_Bator)$$' | \
-               egrep -v '^Faeroe$$' | \
-               egrep -v 
'^(ACT|LHI|NSW|North|Queensland|South|Tasmania|Victoria|West)$$' | \
+           find . -maxdepth 2 -type f | sed -e 's#^\./##' | \
+               egrep -v 
'^(Ashkhabad|Chungking|Dacca|Macao|Thimbu|Ulan_Bator|Faeroe|ACT|LHI|NSW|North|Queensland|South|Tasmania|Victoria|West|Argentina/ComodRivadavia|Buenos_Aires|Catamarca|Cordoba|Jujuy|Mendoza|Rosario|Louisville|Fort_Wayne|Indianapolis|Knox_IN|East-Indiana|East-Starke)$$'
 | \
                sort -n | tr '\n' ',' | sed -e 's#,#, #g' -e 's#, $$#\n#' ; \
            echo "_Description: Time zone:" ; \
            echo " Please select the time zone corresponding to your location." 
; \


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to