← Back to branch summary

~ubuntu-branches/ubuntu/karmic/system-tools-backends/karmic-proposed

« back to all changes in this revision

Viewing changes to debian/patches/06_check_etc_timezone.patch

  • Committer: Bazaar Package Importer
  • Author(s): Emilio Pozuelo Monfort
  • Date: 2009-10-08 11:42:26 UTC
  • mfrom: (1.1.28 upstream) (1.2.4 sid)
  • Revision ID: james.westby@ubuntu.com-20091008114226-zp9fxn7h4ky0qai0
Tags: 2.8.2-1
* New upstream release.
  - debian/patches/01_debian_4.0.patch,
  - debian/patches/04_correct_perl_command.patch:
    + Removed, fixed upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/06_check_etc_timezone.patch
1
 
# Description: Check /etc/timezone instead of /etc/localtime, to fix zones being misreported as some other zone.
2
 
# Ubuntu: https://launchpad.net/bugs/43644
3
 
# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=354661
4
 
# Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=526940
5
 
Index: system-tools-backends-2.6.0/Time/TimeDate.pm
6
 
===================================================================
7
 
--- system-tools-backends-2.6.0.orig/Time/TimeDate.pm   2009-05-04 10:59:40.000000000 -0400
8
 
+++ system-tools-backends-2.6.0/Time/TimeDate.pm        2009-05-04 11:01:13.000000000 -0400
9
 
@@ -200,13 +200,12 @@
10
 
    {
11
 
      fn =>
12
 
      {
13
 
-       ZONEINFO     => "/usr/share/zoneinfo",
14
 
-       LOCAL_TIME   => "/etc/localtime"
15
 
+       TIMEZONE     => "/etc/timezone"
16
 
      },
17
 
      table =>
18
 
      [
19
 
       [ "local_time",   \&get_utc_time ],
20
 
-      [ "timezone",     \&get_timezone, [LOCAL_TIME, ZONEINFO] ],
21
 
+      [ "timezone",     \&Utils::Parse::get_first_line, TIMEZONE ],
22
 
      ]
23
 
    },
24