[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.11.11-1-8-g1dc5647

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-workspace.git;a=commitdiff;h=3638138

The following commit has been merged in the master branch:
commit 3638138ab501ed637eb4c409d9421b68d787b8c2
Author: Harald Sitter <apachelogger at ubuntu.com>
Date:   Thu Sep 26 16:13:47 2013 +0200

    Add kubuntu_avoid_zic_and_deep_copy_timezone_data.diff
    It does not use zic when available as zic is broken. Also adds symlink
    handling, when a tz file is a symlink, it gets the link target and
    copies that instead. This prevents broken symlinks. (LP: #1206199)
    
    Conflicts:
    	debian/patches/series
---
 debian/changelog                                   |  9 ++++++
 ...untu_avoid_zic_and_deep_copy_timezone_data.diff | 34 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 44 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0bc7f66..0d2308f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -201,6 +201,15 @@ kde-workspace (4:4.11.2-1) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 04 Sep 2013 15:51:17 +0200
 
+kde-workspace (4:4.11.1-0ubuntu5) saucy; urgency=low
+
+  * Add kubuntu_avoid_zic_and_deep_copy_timezone_data.diff
+    It does not use zic when available as zic is broken. Also adds symlink
+    handling, when a tz file is a symlink, it gets the link target and
+    copies that instead. This prevents broken symlinks. (LP: #1206199)
+
+ -- Harald Sitter <apachelogger at kubuntu.org>  Thu, 26 Sep 2013 16:09:27 +0200
+
 kde-workspace (4:4.10.5-3) unstable; urgency=low
 
   [ Pino Toscano ]
diff --git a/debian/patches/kubuntu_avoid_zic_and_deep_copy_timezone_data.diff b/debian/patches/kubuntu_avoid_zic_and_deep_copy_timezone_data.diff
new file mode 100644
index 0000000..1145aad
--- /dev/null
+++ b/debian/patches/kubuntu_avoid_zic_and_deep_copy_timezone_data.diff
@@ -0,0 +1,34 @@
+Description: Avoid using zic on Debian systems
+ It does not use zic when available as zic is broken. Also adds symlink
+ handling, when a tz file is a symlink, it gets the link target and
+ copies that instead. This prevents broken symlinks.
+Forwarded: not-needed
+Author: Harald Sitter <apachelogger at kubuntu.org>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/kde-workspace/+bug/1206199
+Last-Update: 2013-09-26
+Index: kde-workspace-4.11.1/kcontrol/dateandtime/helper.cpp
+===================================================================
+--- kde-workspace-4.11.1.orig/kcontrol/dateandtime/helper.cpp	2013-09-26 15:37:48.767903170 +0200
++++ kde-workspace-4.11.1/kcontrol/dateandtime/helper.cpp	2013-09-26 15:47:28.471903101 +0200
+@@ -177,11 +177,20 @@
+ #else
+         QString tz = "/usr/share/zoneinfo/" + selectedzone;
+ 
+-        QString zic = KStandardDirs::findExe("zic", exePath);
++        // Never check for zic as currently it is defunct on Debian systems.
++        // LP: #1212662
++        QString zic;
+         if (!zic.isEmpty()) {
+             KProcess::execute(zic, QStringList() << "-l" << selectedzone);
+         } else if (!QFile::remove("/etc/localtime")) {
+           ret |= TimezoneError;
++        } else if (!QFile::symLinkTarget(tz).isEmpty()) {
++          // If the timezone file is a symlink, get its link target and copy
++          // that instead as otherwise the symlink may end up being broken.
++          // LP: #1206199
++          if (!QFile::copy(QFile::symLinkTarget(tz), "/etc/localtime")) {
++            ret |= TimezoneError;
++          }
+         } else if (!QFile::copy(tz, "/etc/localtime")) {
+           ret |= TimezoneError;
+         }
diff --git a/debian/patches/series b/debian/patches/series
index fe1dd02..b853cf8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ kubuntu_kcm_display_add_kscreen.diff
 kubuntu_no_krandr.diff
 effect_gles_link_against_gles
 unlink_testsock
+kubuntu_avoid_zic_and_deep_copy_timezone_data.diff

-- 
KDE Base Workspace module packaging