[debian-edu-commits] debian-edu/ 01/01: Adjust testsuite/timezone to accept Europe/Oslo as timezone for Germany.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-config.

commit 922e40c071224aadf7f69665913d958f538a5345
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Oct 2 22:13:28 2014 +0200

    Adjust testsuite/timezone to accept Europe/Oslo as timezone for Germany.
---
 debian/changelog   | 2 ++
 testsuite/timezone | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c65d537..0429f82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ debian-edu-config (1.807) UNRELEASED; urgency=high
   * Fix domain-name settings for subnet00.intern and subnet01.intern.
     The invalid names caused ltsp clients to get a wrong /etc/resolv.conf
     generated by the ltsp init script ('search bad').
+  * Adjust testsuite/timezone to accept Europe/Oslo as timezone for
+    Germany.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 02 Oct 2014 21:40:29 +0200
 
diff --git a/testsuite/timezone b/testsuite/timezone
index 18d548f..f7ea747 100755
--- a/testsuite/timezone
+++ b/testsuite/timezone
@@ -35,7 +35,7 @@ map_locale_to_timezone() {
 		       posix/America/Manaus posix/America/Eirunepe"
 	    ;;
 	*_DE*)
-	    localzone="posix/Europe/Berlin"
+	    localzone="Europe/Berlin"
 	    ;;
 	*_DK*)
 	    localzone="posix/Europe/Copenhagen"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git