[SCM] Qt 4 packaging branch, kubuntu_vivid, updated. debian/4.8.6+git64-g5dc8b2b+dfsg-2-7-gf5c6505

[Dmitry Shachnev]

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

The following commit has been merged in the kubuntu_vivid branch:
commit f5c6505fca9c8c23fafc0b8a3ca7bee07c9cf484
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Nov 2 15:00:28 2014 +0300

    Drop kubuntu_31_unity_workarea_atom.diff, it was needed only for Unity 2D.
---
 debian/changelog                                   |   1 +
 debian/patches/kubuntu_31_unity_workarea_atom.diff | 116 ---------------------
 debian/patches/series                              |   1 -
 3 files changed, 1 insertion(+), 117 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 711ea81..e24c2e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qt4-x11 (4:4.8.6+git64-g5dc8b2b+dfsg-3~ubuntu2) UNRELEASED; urgency=medium
 
   * Drop the hacks to build QtWebKit for Assistant, as we now have Assistant
     from Qt 5.x properly built against QtWebKit 5.x.
+  * Drop kubuntu_31_unity_workarea_atom.diff, it was needed only for Unity 2D.
 
  -- Dmitry Shachnev <mitya57 at ubuntu.com>  Sun, 02 Nov 2014 14:56:51 +0300
 
diff --git a/debian/patches/kubuntu_31_unity_workarea_atom.diff b/debian/patches/kubuntu_31_unity_workarea_atom.diff
deleted file mode 100644
index 1872ba3..0000000
--- a/debian/patches/kubuntu_31_unity_workarea_atom.diff
+++ /dev/null
@@ -1,116 +0,0 @@
-Description: Patch from Unity team, non standard so can not go upstream.
- In Unity-2d in MultiMonitor we need to set Struts (for the left panel) in the
- middle of the working area. This means that the specced _NET_WORKAREA is not
- enough since it can only report one rectangle and we end up with two
- disconnected working areas once we add a vertical strut in the left of the
- secondary monitor. For that we have the propietary _UNITY_NET_WORKAREA_REGION
- atom that returns multiple rectangle.
- .
- This patch adds support for this atom to QDesktopWidget::availableGeometry so
- the correct geometry is reported when using Unity-2d
-Author: Albert Astals Cid albert.astals@ canonical.com
-Fowarded: no
-
-
----
- src/gui/kernel/qapplication_x11.cpp   |    4 ++
- src/gui/kernel/qdesktopwidget_x11.cpp |   50 +++++++++++++++++++++++++++++++++-
- src/gui/kernel/qt_x11_p.h             |    1 
- 3 files changed, 53 insertions(+), 2 deletions(-)
-
---- a/src/gui/kernel/qapplication_x11.cpp
-+++ b/src/gui/kernel/qapplication_x11.cpp
-@@ -218,6 +218,7 @@
-     "_NET_SUPPORTED

-- 
Qt 4 packaging