[SCM] Qt 4 packaging branch, master, updated. debian/4.8.7+dfsg-8-6-g296bf46

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=60a9dc3

The following commit has been merged in the master branch:
commit 60a9dc3d4cd3936dbe6fdc5adcb8da52b1d9384f
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Sep 9 08:31:37 2016 -0300

    Refresh patch to make it apply cleanly.
---
 debian/patches/add-lxde-support.patch | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/patches/add-lxde-support.patch b/debian/patches/add-lxde-support.patch
index c066512..7729661 100644
--- a/debian/patches/add-lxde-support.patch
+++ b/debian/patches/add-lxde-support.patch
@@ -6,9 +6,13 @@ Origin: other
 Last-Update: 2016-09-06
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ src/gui/kernel/qapplication_x11.cpp |    5 +++++
+ 1 file changed, 5 insertions(+)
+
 --- a/src/gui/kernel/qapplication_x11.cpp
 +++ b/src/gui/kernel/qapplication_x11.cpp
-@@ -2355,6 +2355,11 @@
+@@ -2355,6 +2355,11 @@ void qt_init(QApplicationPrivate *priv,
                  break;
              }
  
@@ -19,4 +23,4 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +
              // GNOME_DESKTOP_SESSION_ID is deprecated for some reason, but still check it
              if (!qgetenv("GNOME_DESKTOP_SESSION_ID").isEmpty()) {
-                 X11->desktopEnvironment = DE_GNOME;
\ No newline at end of file
+                 X11->desktopEnvironment = DE_GNOME;

-- 
Qt 4 packaging