[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.6.4-1-1-gcf4759f

[Fathi Boudra]

The following commit has been merged in the master branch:
commit cf4759f605bd4f3233710977e3dfde6895019482
Author: Fathi Boudra <fabo at debian.org>
Date:   Sun Jun 26 14:28:21 2011 +0300

    Add krandr_remove_pointless_bash-ism.diff, cherry-picked upstream. (Closes: #630015)
---
 debian/changelog                                   |    8 +++++
 .../patches/krandr_remove_pointless_bash-ism.diff  |   31 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6e1b4ae..c3f0e89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kdebase-workspace (4:4.6.4-2) UNRELEASED; urgency=low
+
+  [ Fathi Boudra ]
+  * Add krandr_remove_pointless_bash-ism.diff, cherry-picked upstream.
+    (Closes: #630015)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 26 Jun 2011 14:26:18 +0300
+
 kdebase-workspace (4:4.6.4-1) unstable; urgency=low
 
   * New upstream release:
diff --git a/debian/patches/krandr_remove_pointless_bash-ism.diff b/debian/patches/krandr_remove_pointless_bash-ism.diff
new file mode 100644
index 0000000..49564b8
--- /dev/null
+++ b/debian/patches/krandr_remove_pointless_bash-ism.diff
@@ -0,0 +1,31 @@
+commit 175afa1e2569eeee204d660628c06928882e034f
+Author: Oswald Buddenhagen <ossi at kde.org>
+Date:   Sun Jun 12 12:47:02 2011 +0200
+
+    remove pointless bash-ism
+    
+    there are no escapes to process here.
+    and as the newlines appear literally in the first place, there is also
+    no reason for using a loop.
+    
+    BUG: 275360
+    FIXED-IN: 4.6.5
+
+---
+ kcontrol/randr/krandrstartup |    5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+--- a/kcontrol/randr/krandrstartup
++++ b/kcontrol/randr/krandrstartup
+@@ -6,10 +6,7 @@
+ if test "$krandrrc_display_applyonstartup" = "true"; then
+     if test -n "$krandrrc_display_startupcommands"; then
+         # new way of simply storing the commands
+-        echo -e "$krandrrc_display_startupcommands" | \
+-        while read command; do
+-            eval "$command"
+-        done
++        eval "$krandrrc_display_startupcommands"
+     else
+         # backwards compatibility
+         # 4 screens is hopefully enough
diff --git a/debian/patches/series b/debian/patches/series
index 57eeac4..7fe5672 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 backport_kwin_multihead_improvements.diff
+krandr_remove_pointless_bash-ism.diff
 kdm_does_not_wreak_havoc.diff
 kdmrc_defaults.diff
 genkdmconf.diff

-- 
KDE Base Workspace module packaging