[SCM] qtbase packaging branch, experimental, updated. debian/5.7.1+dfsg-3-11-g72ee017

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 72ee017a9e09db6e4cf397983e633a7ad40d3d0d
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Feb 9 10:39:27 2017 +0300

    Update for libQt5EglDeviceIntegration → libQt5EglFSDeviceIntegration.
---
 debian/changelog                    | 2 ++
 debian/libqt5gui5.lintian-overrides | 4 ++--
 debian/qtbase5-dev.install-kfreebsd | 2 ++
 debian/qtbase5-dev.install-linux    | 2 ++
 debian/qtbase5-private-dev.install  | 2 --
 debian/rules                        | 2 +-
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bfc6736..4a1f286 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ qtbase-opensource-src (5.8.0+dfsg-1) UNRELEASED; urgency=medium
   * Update symbols files from the amd64 build log.
   * Bump qtbase-abi version to 5-8-0.
   * Update debian/copyright using debian/scripts/update-copyright.
+  * Update the dh_makeshlibs call and the Lintian overrides for
+    libQt5EglDeviceIntegration → libQt5EglFSDeviceIntegration rename.
 
   [ Alexander Volkov ]
   * Remove debian/90qt5-opengl script, no longer needed (refs: #850705).
diff --git a/debian/libqt5gui5.lintian-overrides b/debian/libqt5gui5.lintian-overrides
index 8287439..788df50 100644
--- a/debian/libqt5gui5.lintian-overrides
+++ b/debian/libqt5gui5.lintian-overrides
@@ -8,7 +8,7 @@ libqt5gui5: symbols-declares-dependency-on-other-package qtbase-abi-*
 # We are not shipping headers for them and the only binaries that depend on
 # them are shipped within this very same binary package, so it's safe to
 # override this Lintian warning.
-libqt5gui5: shlib-missing-in-control-file libQt5EglDeviceIntegration 5 for usr/lib/*/libQt5EglDeviceIntegration.so.5.*
+libqt5gui5: shlib-missing-in-control-file libQt5EglFSDeviceIntegration 5 for usr/lib/*/libQt5EglFSDeviceIntegration.so.5.*
 libqt5gui5: shlib-missing-in-control-file libQt5EglFsKmsSupport 5 for usr/lib/*/libQt5EglFsKmsSupport.so.5.*
 libqt5gui5: shlib-missing-in-control-file libQt5XcbQpa 5 for usr/lib/*/libQt5XcbQpa.so.5.*
 # libQt5EglDeviceIntegration and libQt5XcbQpa are actually private libraries
@@ -18,6 +18,6 @@ libqt5gui5: shlib-missing-in-control-file libQt5XcbQpa 5 for usr/lib/*/libQt5Xcb
 # We are not shipping headers for them and the only binaries that depend on
 # them are shipped within this very same binary package, so it's safe to
 # override this Lintian warning.
-libqt5gui5: shlib-missing-in-symbols-control-file libQt5EglDeviceIntegration 5 for usr/lib/*/libQt5EglDeviceIntegration.so.5.*
+libqt5gui5: shlib-missing-in-symbols-control-file libQt5EglFSDeviceIntegration 5 for usr/lib/*/libQt5EglFSDeviceIntegration.so.5.*
 libqt5gui5: shlib-missing-in-symbols-control-file libQt5EglFsKmsSupport 5 for usr/lib/*/libQt5EglFsKmsSupport.so.5.*
 libqt5gui5: shlib-missing-in-symbols-control-file libQt5XcbQpa 5 for usr/lib/*/libQt5XcbQpa.so.5.*
diff --git a/debian/qtbase5-dev.install-kfreebsd b/debian/qtbase5-dev.install-kfreebsd
index a6da608..0350ba5 100644
--- a/debian/qtbase5-dev.install-kfreebsd
+++ b/debian/qtbase5-dev.install-kfreebsd
@@ -1,2 +1,4 @@
+usr/lib/*/libQt5EglFSDeviceIntegration.prl
+usr/lib/*/libQt5EglFSDeviceIntegration.so
 usr/lib/*/libQt5EglFsKmsSupport.prl
 usr/lib/*/libQt5EglFsKmsSupport.so
diff --git a/debian/qtbase5-dev.install-linux b/debian/qtbase5-dev.install-linux
index a6da608..0350ba5 100644
--- a/debian/qtbase5-dev.install-linux
+++ b/debian/qtbase5-dev.install-linux
@@ -1,2 +1,4 @@
+usr/lib/*/libQt5EglFSDeviceIntegration.prl
+usr/lib/*/libQt5EglFSDeviceIntegration.so
 usr/lib/*/libQt5EglFsKmsSupport.prl
 usr/lib/*/libQt5EglFsKmsSupport.so
diff --git a/debian/qtbase5-private-dev.install b/debian/qtbase5-private-dev.install
index 0768d35..3d116da 100644
--- a/debian/qtbase5-private-dev.install
+++ b/debian/qtbase5-private-dev.install
@@ -77,8 +77,6 @@ usr/lib/*/libQt5AccessibilitySupport.a
 usr/lib/*/libQt5AccessibilitySupport.prl
 usr/lib/*/libQt5DeviceDiscoverySupport.a
 usr/lib/*/libQt5DeviceDiscoverySupport.prl
-usr/lib/*/libQt5EglFSDeviceIntegration.prl
-usr/lib/*/libQt5EglFSDeviceIntegration.so
 usr/lib/*/libQt5EglSupport.a
 usr/lib/*/libQt5EglSupport.prl
 usr/lib/*/libQt5EventDispatcherSupport.a
diff --git a/debian/rules b/debian/rules
index a31221f..12db4c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -327,7 +327,7 @@ override_dh_strip:
 	dh_strip --remaining-packages --dbgsym-migration='qtbase5-dbg (<< 5.7.1+dfsg-1~)'
 
 override_dh_makeshlibs:
-	dh_makeshlibs -V -XlibQt5EglDeviceIntegration -XlibQt5EglFsKmsSupport -XlibQt5XcbQpa
+	dh_makeshlibs -V -XlibQt5EglFSDeviceIntegration -XlibQt5EglFsKmsSupport -XlibQt5XcbQpa
 
 override_dh_clean:
 	dh_clean

-- 
qtbase packaging