[SCM] qtbase packaging branch, master, updated. debian/5.5.1+dfsg-12-13-gdd8e618

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit dd8e61888b743f28e5ff8d9040911abfe8155716
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Jan 20 11:47:38 2016 -0300

    Revert "There is no real point in avoiding creating symbols for hese private libs"
    
    This reverts commit 89d190ee7485c037cd421f68ea2bb54514077803.
    
    Actually there is, and quite a lot.
    
    Both libs are private and *only used* by the plugins. In other words,
    exclusively accesible for each related plugin which is shipped in the
    same binary package.
    
    At this point having shlibs or symbols files referencing them is really
    not necessary, moreoever it causes more work for handling symbols files.
---
 debian/changelog | 2 ++
 debian/rules     | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 42f3531..cb9618a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ qtbase-opensource-src (5.5.1+dfsg-13) UNRELEASED; urgency=medium
     (Closes: #810282). Thanks Jakob Haufe for the pointer.
   * Merge platforms plugins back into libqt5gui5: libqt5egldeviceintegration5
     and libqt5xcbqpa5.
+    - Avoid creating shlibs and symbols files for the private libraries they
+      ship.
     - Add proper Breaks+Replaces.
     - Remove other mentions of them.
     - Add a transitional dummy package for libqt5xcbqpa5 as it's the only one
diff --git a/debian/rules b/debian/rules
index 6182a92..5d4ea15 100755
--- a/debian/rules
+++ b/debian/rules
@@ -328,7 +328,8 @@ override_dh_strip:
 	dh_strip --remaining-packages --dbg-package=qtbase5-dbg
 
 override_dh_makeshlibs:
-	dh_makeshlibs -V
+	dh_makeshlibs -V -plibqt5gui5 -XlibQt5EglDeviceIntegration.so -X libQt5XcbQpa.so
+	dh_makeshlibs -V --remaining-packages
 
 	# Check for private symbols not marked as such. Be verbose.
 	pkgkde-mark-private-symbols debian/qtbase5-private-dev/usr/include

-- 
qtbase packaging