[SCM] plasma-desktop packaging branch, master, updated. debian/5.4.1-1-6-gf926fb7

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 17192decb208fc031cc1d92cad49845d5a4a17d4
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Sep 15 10:48:59 2015 +0200

    New patch: allow_uxterm_overrides.diff (Closes: #797482)
---
 debian/changelog                           |  2 ++
 debian/patches/allow_uxterm_overrides.diff | 31 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ba154e8..c127e02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ plasma-desktop (4:5.4.1-2~) UNRELEASED; urgency=medium
     - Thanks to Ralph Jung for the report
 
   [ Maximiliano Curia ]
+  * New patch: allow_uxterm_overrides.diff (Closes: #797482) Thanks to
+    Thorsten Glaser
 
  -- Scott Kitterman <scott at kitterman.com>  Sun, 20 Sep 2015 12:05:13 -0400
 
diff --git a/debian/patches/allow_uxterm_overrides.diff b/debian/patches/allow_uxterm_overrides.diff
new file mode 100644
index 0000000..f88fea2
--- /dev/null
+++ b/debian/patches/allow_uxterm_overrides.diff
@@ -0,0 +1,31 @@
+Description: 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.
+Author: Thorsten Glaser <tg at mirbsd.de>
+Bug-Debian: https://bugs.debian.org/797482
+Forwarded: no
+Reviewed-by: Maximiliano Curia
+Last-Update: 2015-09-15
+---
+Index: plasma-desktop/kcms/krdb/ad/XTerm.ad
+===================================================================
+--- plasma-desktop.orig/kcms/krdb/ad/XTerm.ad	2015-09-11 18:00:30.641665196 +0200
++++ plasma-desktop/kcms/krdb/ad/XTerm.ad	2015-09-15 10:39:45.660667501 +0200
+@@ -1,4 +1,8 @@
+-xterm*background: WINDOW_BACKGROUND
+-xterm*foreground: WINDOW_FOREGROUND
+-xterm.SimpleMenu*background: BACKGROUND
+-xterm.SimpleMenu*foreground: FOREGROUND
++Xterm*background: WINDOW_BACKGROUND
++Xterm*foreground: WINDOW_FOREGROUND
++Xterm.SimpleMenu*background: BACKGROUND
++Xterm.SimpleMenu*foreground: FOREGROUND
++UXterm*background: WINDOW_BACKGROUND
++UXterm*foreground: WINDOW_FOREGROUND
++UXterm.SimpleMenu*background: BACKGROUND
++UXterm.SimpleMenu*foreground: FOREGROUND
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..830bdcc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+allow_uxterm_overrides.diff

-- 
plasma-desktop packaging