[SCM] qtdeclarative packaging branch, ubuntu+1, updated. debian/5.9.0-beta3-2-158-g47d6008

[Simon Quigley]

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

The following commit has been merged in the ubuntu+1 branch:
commit 62310182bd7392206b4dfe4df97d2964dc942553
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date:   Thu Jun 15 16:05:31 2017 -0500

    Drop support for the gles packages.
---
 debian/changelog | 2 ++
 debian/control   | 9 +++++----
 debian/rules     | 3 +--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0faaf98..68f4b5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 qtdeclarative-opensource-src (5.9.0-1ubuntu1) UNRELEASED; urgency=medium
 
   * Merge from Debian Experimental in Git repo.
+  * Dropped from the delta:
+    - Support the gles packages.
   * Disable or remove the following patches:
     - Fix-SignalSpy-with-QQmlPropertyMap-signals.patch
     - Fix-visibility-of-properties-in-value-types.patch
diff --git a/debian/control b/debian/control
index 7f2ab8c..748e884 100644
--- a/debian/control
+++ b/debian/control
@@ -32,6 +32,7 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: libgl1-mesa-glx
 Suggests: qt5-qmltooling-plugins
 Description: Qt 5 QML module
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -239,7 +240,7 @@ Package: qml-module-qtquick2
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libgl1-mesa-dri | libgl1, ${misc:Depends}, ${shlibs:Depends}
+Depends: libgl1-mesa-dri, ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 5 Qt Quick 2 QML module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -340,10 +341,10 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libqt5qml5 (= ${binary:Version}),
-         libqt5quick5 (= ${binary:Version}) | libqt5quick5-gles,
-         libqt5quickparticles5 (= ${binary:Version}) | libqt5quickparticles5-gles,
+         libqt5quick5 (= ${binary:Version}),
+         libqt5quickparticles5 (= ${binary:Version}),
          libqt5quicktest5 (= ${binary:Version}),
-         libqt5quickwidgets5 (= ${binary:Version}) | libqt5quickwidgets5-gles,
+         libqt5quickwidgets5 (= ${binary:Version}),
          qt5-qmltooling-plugins,
          qtbase5-dev,
          ${misc:Depends}
diff --git a/debian/rules b/debian/rules
index aa87a38..f489a3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,8 +55,7 @@ override_dh_install:
 	dh_install --fail-missing
 
 override_dh_makeshlibs:
-	# On Ubuntu no -V due to -gles twin packages
-	dh_makeshlibs
+	dh_makeshlibs -V
 
 override_dh_auto_test-arch:
 ifneq ("$(DEB_HOST_ARCH)$(DEB_HOST_SERIES)","ppc64elxenial")

-- 
qtdeclarative packaging