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

[pere at alioth.debian.org]

Author: pere
Date: 2013-04-20 21:40:56 +0000 (Sat, 20 Apr 2013)
New Revision: 79649

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/testsuite/timezone
Log:
Correct timezone testsuite check to look for new timezone name for
the *_BE, *_DE, *_DK and *_NO locales.  Need updates for the other
locales too.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-04-20 21:16:32 UTC (rev 79648)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-04-20 21:40:56 UTC (rev 79649)
@@ -2,6 +2,9 @@
 
   * New testsuite test to verify that the RDP server is running
     and accepting TCP connections.
+  * Correct timezone testsuite check to look for new timezone name for
+    the *_BE, *_DE, *_DK and *_NO locales.  Need updates for the other
+    locales too.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 20 Apr 2013 23:14:22 +0200
 

Modified: branches/wheezy/debian-edu-config/testsuite/timezone
===================================================================
--- branches/wheezy/debian-edu-config/testsuite/timezone	2013-04-20 21:16:32 UTC (rev 79648)
+++ branches/wheezy/debian-edu-config/testsuite/timezone	2013-04-20 21:40:56 UTC (rev 79649)
@@ -24,7 +24,7 @@
 map_locale_to_timezone() {
     case "$1" in
 	*_BE*)
-	    localzone="Europe/Brussels"
+	    localzone="posix/Europe/Brussels"
 	    ;;
 	*_BR*)
 	    localzone="America/Sao_Paulo America/Noronha \
@@ -36,10 +36,10 @@
 		       America/Rio_Brancor"
 	    ;;
 	*_DE*)
-	    localzone="Europe/Berlin"
+	    localzone="posix/Europe/Berlin"
 	    ;;
 	*_DK*)
-	    localzone="Europe/Copenhagen"
+	    localzone="posix/Europe/Copenhagen"
 	    ;;
 	*_ES*)
 	    localzone="Europe/Madrid"
@@ -65,7 +65,7 @@
 	    localzone="Europe/Amsterdam"
 	    ;;
 	*_NO*)
-	    localzone="Europe/Oslo"
+	    localzone="posix/Atlantic/Jan_Mayen"
 	    ;;
 	*_PL*)
 	    localzone="Europe/Warsaw"