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

[Dmitry Shachnev]

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

The following commit has been merged in the kubuntu_vivid branch:
commit 4be52b75ab7d6a8394e519e6b49136bc810a3f77
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Nov 4 21:30:36 2014 +0300

    The final piece for the armhf puzzle.
---
 debian/changelog                                | 6 ++++++
 debian/patches/kubuntu_43_no_meego_helper.patch | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e9e3212..8cea768 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qt4-x11 (4:4.8.6+git64-g5dc8b2b+dfsg-3~ubuntu4) UNRELEASED; urgency=medium
+
+  * kubuntu_43_no_meego_helper.patch: Patch in one more location.
+
+ -- Dmitry Shachnev <mitya57 at ubuntu.com>  Tue, 04 Nov 2014 21:29:04 +0300
+
 qt4-x11 (4:4.8.6+git64-g5dc8b2b+dfsg-3~ubuntu3) vivid; urgency=medium
 
   * kubuntu_43_no_meego_helper.patch: Don’t build QtMeegoGraphicsSystemHelper,
diff --git a/debian/patches/kubuntu_43_no_meego_helper.patch b/debian/patches/kubuntu_43_no_meego_helper.patch
index 9a56a06..5f0def9 100644
--- a/debian/patches/kubuntu_43_no_meego_helper.patch
+++ b/debian/patches/kubuntu_43_no_meego_helper.patch
@@ -11,3 +11,11 @@ Last-Update: 2014-11-04
  !win32:!embedded:!mac:!symbian:CONFIG += x11
 -
 -x11:contains(QT_CONFIG, opengles2):contains(QT_CONFIG, egl):SUBDIRS += qmeegographicssystemhelper
+--- a/src/plugins/graphicssystems/graphicssystems.pro
++++ b/src/plugins/graphicssystems/graphicssystems.pro
+@@ -11,5 +11,3 @@
+ }
+ 
+ !win32:!embedded:!mac:!symbian:CONFIG += x11
+-
+-x11:contains(QT_CONFIG, opengles2):contains(QT_CONFIG, egl):SUBDIRS += meego

-- 
Qt 4 packaging