[SCM] qtbase packaging branch, kubuntu_unstable, updated. debian/5.4.1+dfsg-2-5-gf4be3fd

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit edf5507d8cf6efb489f6274a41c052336bd896a5
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Feb 25 19:16:20 2015 +0300

    Drop obsolete override_dh_makeshlibs code, no longer needed.
    
    That code was added in qt4-x11 when we didn't even have symbols files.
---
 debian/changelog |  1 +
 debian/rules     | 16 +---------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1875a4b..421c729 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtbase-opensource-src (5.4.1+dfsg-2) UNRELEASED; urgency=medium
   * Symbols files:
     - Update from buildds’ logs.
     - Mark symbols missing with GCC 5 as optional.
+  * Drop obsolete override_dh_makeshlibs code, no longer needed.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 25 Feb 2015 10:39:31 +0300
 
diff --git a/debian/rules b/debian/rules
index 1c51729..fbe18e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,14 +14,8 @@ export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags -
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
-# Library package list for override_dh_makeshlibs, excludes -dev -dbg
-pkgs_lib := $(filter-out %-dev %-dbg,$(filter lib%,$(shell dh_listpackages)))
 # Upstream changelog
 upstream_changes := dist/changes-$(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | cut -f1 -d '-' | sed -e 's/+dfsg//' | sed -e 's/+git.*//')
-# Current debian version (e.g.: 4:4.5.2-1)
-current_version := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
-# Specific shlibs version (e.g.: 4:4.5.2)
-shlibs_version := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | cut -f1 -d '-')
 # Distribution vendor
 vendor := $(shell dpkg-vendor --query Vendor)
 
@@ -204,7 +198,6 @@ override_dh_auto_clean:
 	| cut -d ':' -f 1 | xargs rm -f
 
 	# Generated on build
-	rm -f debian/shlibs.local
 	rm -f debian/stamp-makefile-build-tools
 
 	# more leftovers
@@ -317,14 +310,7 @@ override_dh_strip:
 	dh_strip --remaining-packages --dbg-package=qtbase5-dbg
 
 override_dh_makeshlibs:
-	# Specific shlibs version (e.g.: 4:4.5.2)
-	$(foreach pkg,$(pkgs_lib),dh_makeshlibs -p$(pkg) -V '$(pkg) (>= $(shlibs_version))' -- -c0;)
-	# Generate shlibs local files
-	for pkg in $(pkgs_lib); do \
-		if test -e debian/$${pkg}/DEBIAN/shlibs ; then \
-			sed 's/>=[^)]*/= $(current_version)/' debian/$${pkg}/DEBIAN/shlibs >> debian/shlibs.local ;\
-		fi \
-	done
+	dh_makeshlibs
 
 	# Check for private symbols not marked as such. Be verbose.
 	DEBUG=1 debian/mark_private_symbols.sh

-- 
qtbase packaging