[Pkg-sugar-commit] [sugar] 05/09: Update patches: Tidy patch headers. Advertise DEP-3 format in patch headers. Drop patch unused and obsolete since 2008.

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository sugar.

commit b32806530c669ef9b5232802c11ba3a4bb359b27
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Aug 29 17:29:07 2017 +0200

    Update patches: Tidy patch headers. Advertise DEP-3 format in patch headers. Drop patch unused and obsolete since 2008.
---
 debian/patches/empy_from_system.patch           |  6 ++-
 debian/patches/empy_from_system_autotools.patch | 10 ++---
 debian/patches/fix_tz_config_path.patch         | 49 -------------------------
 debian/patches/series                           |  1 -
 4 files changed, 9 insertions(+), 57 deletions(-)

diff --git a/debian/patches/empy_from_system.patch b/debian/patches/empy_from_system.patch
index 2c32b12..72b22fe 100644
--- a/debian/patches/empy_from_system.patch
+++ b/debian/patches/empy_from_system.patch
@@ -1,7 +1,9 @@
-From: Jonas Smedegaard <dr at jones.dk>
-Subject: Use empy from system
+Description: Use empy from system
+Author: Jonas Smedegaard <dr at jones.dk>
 Forwarded: not-needed
 Last-Update: 2009-11-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/data/Makefile.am
 +++ b/data/Makefile.am
 @@ -1,11 +1,11 @@
diff --git a/debian/patches/empy_from_system_autotools.patch b/debian/patches/empy_from_system_autotools.patch
index 14d48bc..7f82a20 100644
--- a/debian/patches/empy_from_system_autotools.patch
+++ b/debian/patches/empy_from_system_autotools.patch
@@ -1,10 +1,10 @@
-From: Jonas Smedegaard <dr at jones.dk>
-Subject: Apply use of empy from system to autotools
-
-Only applied as patch to avoid bloating diffs by regenerating autotools.
-
+Description: Apply use of empy from system to autotools
+ Only applied as patch to avoid bloating diffs by regenerating autotools.
+Author: Jonas Smedegaard <dr at jones.dk>
 Forwarded: not-needed
 Last-Update: 2009-11-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/data/Makefile.in
 +++ b/data/Makefile.in
 @@ -846,11 +846,11 @@
diff --git a/debian/patches/fix_tz_config_path.patch b/debian/patches/fix_tz_config_path.patch
deleted file mode 100644
index 73b3137..0000000
--- a/debian/patches/fix_tz_config_path.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Jonas Smedegaard <dr at jones.dk>
-Subject: Adapt timezone handling to Debian environment
-
-Debian-specific environment handling only relevant on, well, Debian.
-
-Upstream might want to not be Fedora-specific, however...
-
-Forwarded: not-needed
-Last-Update: 2009-11-05
-diff --git a/src/controlpanel/control.py b/src/controlpanel/control.py
-index faac689..a6d9d04 100644
---- a/src/controlpanel/control.py
-+++ b/src/controlpanel/control.py
-@@ -45,7 +45,7 @@ _COLORS = {'red': {'dark':'#b20008', 'medium':'#e6000a', 'light':'#ffadce'},
- 
- _MODIFIERS = ('dark', 'medium', 'light')
- 
--_TIMEZONE_CONFIG = '/etc/sysconfig/clock'
-+_TIMEZONE_CONFIG = '/etc/timezone'
- 
- _LANGUAGES = {
-     'Afrikaans/South_Africa': 'af_ZA',
-@@ -351,13 +351,8 @@ def get_timezone():
-             line = line.strip()
-             if len (line) and line[0] == '#':
-                 continue
--            try:
--                tokens = line.split("=")
--                if tokens[0] == "ZONE":
--                    timezone = tokens[1].replace('"', '')
--                    return timezone        
--            except Exception, e:
--                print "get_timezone: %s" % e
-+            timezone = line
-+            return timezone
-     except Exception, e:
-         print "get_timezone: %s" % e
-     return None
-@@ -407,9 +402,7 @@ def set_timezone(timezone):
-                 
-         # Write info to the /etc/sysconfig/clock file
-         fd = open(_TIMEZONE_CONFIG, "w")
--        fd.write('# use sugar-control-panel to change this\n')
--        fd.write('ZONE="%s"\n' % timezone)
--        fd.write('UTC=true\n')
-+        fd.write(timezone)
-         fd.close()                       
-     else:
-         print (_("Error timezone does not exist."))
diff --git a/debian/patches/series b/debian/patches/series
index e2b87cf..732f758 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 empy_from_system.patch
-#fix_tz_config_path.patch
 empy_from_system_autotools.patch

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