[SCM] qtbase packaging branch, kubuntu_unstable, updated. debian/5.4.0+dfsg-4-35-geff4780

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit d69a78d0f8cd88113f0dd0e96ba7eda108e95acb
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Feb 18 23:07:21 2015 -0300

    Do not ship libQt5Bootstrap.
    
    it's only used internally.
---
 debian/changelog                  | 1 +
 debian/qtbase5-dev.install-common | 5 +----
 debian/rules                      | 5 +++++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bafbfec..97581ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ qtbase-opensource-src (5.4.0+dfsg-5) UNRELEASED; urgency=medium
   * Add remove_privacy_breachs.diff in order to remove some non-used javascript
     code. It is not really needed, but it's the best way to calm down Lintian
     and be sure nothing will break in the future.
+  * Do not ship libQt5Bootstrap, it's only used internally (Closes: #778717).
 
   [ Dmitry Shachnev ]
   * Drop private marks from QCollator, QOpenGLWidget and QAccessible*
diff --git a/debian/qtbase5-dev.install-common b/debian/qtbase5-dev.install-common
index f7d919f..f48d31f 100644
--- a/debian/qtbase5-dev.install-common
+++ b/debian/qtbase5-dev.install-common
@@ -13,8 +13,6 @@ usr/include/*/qt5/QtTest/*
 usr/include/*/qt5/QtWidgets/*
 usr/include/*/qt5/QtXml/*
 usr/lib/*/cmake/*
-usr/lib/*/libQt5Bootstrap.a
-usr/lib/*/libQt5Bootstrap.prl
 usr/lib/*/libQt5Concurrent.prl
 usr/lib/*/libQt5Concurrent.so
 usr/lib/*/libQt5Core.prl
@@ -37,7 +35,6 @@ usr/lib/*/libQt5Widgets.prl
 usr/lib/*/libQt5Widgets.so
 usr/lib/*/libQt5Xml.prl
 usr/lib/*/libQt5Xml.so
-usr/lib/*/pkgconfig/Qt5Bootstrap.pc
 usr/lib/*/pkgconfig/Qt5Concurrent.pc
 usr/lib/*/pkgconfig/Qt5Core.pc
 usr/lib/*/pkgconfig/Qt5DBus.pc
@@ -49,4 +46,4 @@ usr/lib/*/pkgconfig/Qt5Sql.pc
 usr/lib/*/pkgconfig/Qt5Test.pc
 usr/lib/*/pkgconfig/Qt5Widgets.pc
 usr/lib/*/pkgconfig/Qt5Xml.pc
-usr/share/qt5/doc/global/*
\ No newline at end of file
+usr/share/qt5/doc/global/*
diff --git a/debian/rules b/debian/rules
index 74edea8..fa5fd03 100755
--- a/debian/rules
+++ b/debian/rules
@@ -268,6 +268,11 @@ endif
 	# are via CMake, so don't install them.
 	rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt5*/Q*Plugin.cmake
 
+	# There is also no need to install libQtBootstrap. As it's name indicates it's
+	# only used to bootstrap qt.
+	rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt5Bootstrap*
+	rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/Qt5Bootstrap.pc
+
 	# Remove bogus exec bits from some data files in mkspecs, docs, examples
 	find debian/tmp/usr/share/qt5/ debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/ \
 		-perm /u+x,g+x,o+x -type f \

-- 
qtbase packaging