[SCM] plasma-desktop packaging branch, master, updated. debian/5.6.5-1-28-g842c380

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-desktop.git;a=commitdiff;h=9edbf5c

The following commit has been merged in the master branch:
commit 9edbf5cf5f1649a9f9bea5887ab4adc3fde92001
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Aug 27 19:09:36 2016 +0200

    Add back the allow_uxterm_overrides patch headers
    
    Gbp-Dch: Ignore
---
 debian/patches/allow_uxterm_overrides.diff | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/debian/patches/allow_uxterm_overrides.diff b/debian/patches/allow_uxterm_overrides.diff
index 7c1edad..e6ba7ac 100644
--- a/debian/patches/allow_uxterm_overrides.diff
+++ b/debian/patches/allow_uxterm_overrides.diff
@@ -1,7 +1,19 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+From: Thorsten Glaser <tg at mirbsd.de>
 Date: Wed, 6 Apr 2016 23:57:23 +0200
-Subject: allow_uxterm_overrides
+Subject: Allow xterm/uxterm resources overrides
 
+Using the lower case instance refers to application name instead to the
+window class and has higher priority than setting the window class. This
+prohibits the use of different classes for the same application,
+something used by the xterm/uxterm users.
+
+This changes the resource mangling to just set the default classes
+allowing the users to override them.
+
+Bug-Debian: https://bugs.debian.org/797482
+Forwarded: no
+Reviewed-by: Maximiliano Curia
+Last-Update: 2015-09-15
 ---
  kcms/krdb/ad/XTerm.ad | 12 ++++++++----
  1 file changed, 8 insertions(+), 4 deletions(-)

-- 
plasma-desktop packaging