[debian-edu-commits] r80795 - in branches/wheezy/debian-edu-config: debian testsuite

[holger at alioth.debian.org]

Author: holger
Date: 2013-06-16 20:45:10 +0000 (Sun, 16 Jun 2013)
New Revision: 80795

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/testsuite/timezone
Log:
Update timezone testsuite checks for all other languages based on
/usr/share/zoneinfo on my wheezy system. 

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-06-16 18:18:00 UTC (rev 80794)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-06-16 20:45:10 UTC (rev 80795)
@@ -7,6 +7,10 @@
   * Correct timezone testsuite check to look for new timezone name for
     the *_ES locale.  Need updates for the other locales too.
 
+  [ Holger Levsen ]
+  * Update timezone testsuite checks for all other languages based on
+    /usr/share/zoneinfo on my wheezy system. 
+
  -- Petter Reinholdtsen <pere at debian.org>  Fri, 14 Jun 2013 11:38:56 +0200
 
 debian-edu-config (1.707~svn80617) wheezy-test; urgency=low

Modified: branches/wheezy/debian-edu-config/testsuite/timezone
===================================================================
--- branches/wheezy/debian-edu-config/testsuite/timezone	2013-06-16 18:18:00 UTC (rev 80794)
+++ branches/wheezy/debian-edu-config/testsuite/timezone	2013-06-16 20:45:10 UTC (rev 80795)
@@ -27,13 +27,12 @@
 	    localzone="posix/Europe/Brussels"
 	    ;;
 	*_BR*)
-	    localzone="America/Sao_Paulo America/Noronha \
-	               America/Belem America/Fortaleza \
-		       America/Recife America/Araguaina \
-		       America/Maceio America/Cuiaba \
-		       America/Porto_Velho America/Boa_Vista \
-		       America/Manaus America/Eirunepe \
-		       America/Rio_Brancor"
+	    localzone="posix/America/Sao_Paulo posix/America/Noronha \
+	               posix/America/Belem posix/America/Fortaleza \
+		       posix/America/Recife posix/America/Araguaina \
+		       posix/America/Maceio posix/America/Cuiaba \
+		       posix/America/Porto_Velho posix/America/Boa_Vista \
+		       posix/America/Manaus posix/America/Eirunepe"
 	    ;;
 	*_DE*)
 	    localzone="posix/Europe/Berlin"
@@ -45,33 +44,33 @@
 	    localzone="posix/Europe/Madrid"
 	    ;;
 	*_FI*)
-	    localzone="Europe/Helsinki"
+	    localzone="posix/Europe/Helsinki"
 	    ;;
 	*_FR*)
-	    localzone="Europe/Paris"
+	    localzone="posix/Europe/Paris"
 	    ;;
 	*_IT*)
-	    localzone="Europe/Rome"
+	    localzone="posix/Europe/Rome"
 	    ;;
 	*_LV*)
-	    localzone="Europe/Riga"
+	    localzone="posix/Europe/Riga"
 	    ;;
 	*_MX*)
-	    localzone="America/Mexico_City America/Cancun America/Merida \
-	               America/Monterrey America/Mazatlan America/Chihuahua \
-		       America/Hermosillo America/Tijuana"
+	    localzone="Mexico/General posix/America/Cancun posix/America/Merida \
+	               posix/America/Monterrey Mexico/BajaSur posix/America/Chihuahua \
+		       posix/America/Hermosillo Mexico/BajaNorte"
 	    ;;
 	*_NL*)
-	    localzone="Europe/Amsterdam"
+	    localzone="posix/Europe/Amsterdam"
 	    ;;
 	*_NO*)
 	    localzone="posix/Atlantic/Jan_Mayen"
 	    ;;
 	*_PL*)
-	    localzone="Europe/Warsaw"
+	    localzone="posix/Europe/Warsaw"
 	    ;;
 	*_SE*)
-	    localzone="Europe/Stockholm"
+	    localzone="posix/Europe/Stockholm"
 	    ;;
 	*)
 	    # Accept the existing value if the default language is unspecified