[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.6.1+dfsg-3ubuntu2-10-ge76670e

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 28728f625131f277fcaf3972b1ee4a2888200cf8
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Feb 17 10:03:43 2016 +0000

    Fix debian/rules.
---
 debian/rules | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index 220c900..c5c04f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -385,14 +385,14 @@ override_dh_strip:
 	dh_strip --remaining-packages --dbg-package=qtbase5-dbg
 
 override_dh_makeshlibs:
-<<<<<<< HEAD
 	# Don't uncomment until rid of -gles packages
-	#dh_makeshlibs -V
-	dh_makeshlibs
-=======
-	dh_makeshlibs -V -plibqt5gui5 -XlibQt5EglDeviceIntegration.so -X libQt5XcbQpa.so
-	dh_makeshlibs -V --remaining-packages
->>>>>>> experimental
+	#dh_makeshlibs -V -plibqt5gui5 -XlibQt5EglDeviceIntegration.so -X libQt5XcbQpa.so
+	#dh_makeshlibs -V --remaining-packages
+	dh_makeshlibs -plibqt5gui5 -XlibQt5EglDeviceIntegration.so -X libQt5XcbQpa.so
+	dh_makeshlibs --remaining-packages
+
+	# Check for private symbols not marked as such. Be verbose.
+	pkgkde-mark-private-symbols debian/qtbase5-private-dev/usr/include
 
 override_dh_clean:
 	dh_clean

-- 
qtbase packaging