[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.4.5-3-4-g27f06b8

[Modestas Vainius]

The following commit has been merged in the master branch:
commit fd0fcebed42bddfb45c092f92488a446b5aa39e4
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Oct 17 12:35:45 2010 +0300

    Backport oneliner patch which is likely to fix dual head support in plasma.
    
    Bug: https://bugs.kde.org/show_bug.cgi?id=156475
    Origin: backport http://websvn.kde.org/?view=rev&revision=1182543
---
 debian/changelog                                   |    7 ++++++-
 .../28_backport_bug156475_dualhead_support.diff    |   20 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f7111e0..4dec951 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
-kdebase-workspace (4:4.4.5-4) UNRELEASED; urgency=low
+kdebase-workspace (4:4.4.5-4~pre1) UNRELEASED; urgency=low
 
+  [ Frederik Schwarzer ]
   *  Add a patch that doubles the time KDM waits for X to start
 
+  [ Modestas Vainius ]
+  * Backport oneliner patch which is likely to fix dual head support in plasma
+    (KDE bug #156475).
+
  -- Frederik Schwarzer <schwarzerf at gmail.com>  Sun, 26 Sep 2010 16:17:42 +0200
 
 kdebase-workspace (4:4.4.5-3) unstable; urgency=low
diff --git a/debian/patches/28_backport_bug156475_dualhead_support.diff b/debian/patches/28_backport_bug156475_dualhead_support.diff
new file mode 100644
index 0000000..cbf6569
--- /dev/null
+++ b/debian/patches/28_backport_bug156475_dualhead_support.diff
@@ -0,0 +1,20 @@
+From: Aaron J. Seigo <aseigo at kde.org>
+Subject: attempt to fix dual head support
+Origin: backport http://websvn.kde.org/?view=rev&revision=1182543
+Bug: https://bugs.kde.org/show_bug.cgi?id=156475
+Applied-Upstream: 4.5.3
+
+convert the number first to a string, otherwise it doesn't append anything.
+noticed by Oliver oin the BR
+
+--- a/plasma/desktop/shell/main.cpp
++++ b/plasma/desktop/shell/main.cpp
+@@ -91,7 +91,7 @@ KDE_EXPORT int kdemain(int argc, char **
+ 
+     QByteArray appName = "plasma-desktop";
+     if (associatedScreen > 0) {
+-        appName.append("-screen-").append(associatedScreen);
++        appName.append("-screen-").append(QByteArray::number(associatedScreen));
+     }
+ 
+     KAboutData aboutData(appName, 0, ki18n("Plasma Workspace"),
diff --git a/debian/patches/series b/debian/patches/series
index 305e480..50a6452 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,6 +12,7 @@
 21_kdm_doesnt_use_kstandarddirs.diff
 22_kdm_xreset_hook_framework.diff
 26_run_kaboom_when_starting_kde.diff
+28_backport_bug156475_dualhead_support.diff
 97_fix_target_link_libraries.diff
 27_ld_exclude_libs_qtuitools.diff
 99_solid_network_use_ntrack.diff

-- 
KDE Base Workspace module packaging