[SCM] KDE PIM Libraries module packaging branch, master, updated. debian/4.4.5-2-62-ga3b81f7
Modestas Vainius
modax at alioth.debian.org
Wed Apr 6 12:46:06 UTC 2011
The following commit has been merged in the master branch:
commit 6c5587057ca8720829dc4c8d357701e71c973620
Author: Modestas Vainius <modax at debian.org>
Date: Wed Apr 6 15:11:33 2011 +0300
Stop caring about shlibs.
They are not used since libraries have symbol files.
---
debian/changelog | 1 +
debian/rules | 20 --------------------
2 files changed, 1 insertions(+), 20 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2653d10..2bedde4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,7 @@ kdepimlibs (4:4.6.2-0r1) UNRELEASED; urgency=low
* Switch debian/rules engine to dhmk based qt-kde-team/2/*.
* Disable testsuite.
* Remove a deprecated link to the BSD license from debian/copyright.
+ * Stop caring about shlibs. They are not used since libraries have symbol files.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 27 Mar 2011 21:48:40 +0300
diff --git a/debian/rules b/debian/rules
index e6cf97c..018cc4b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,23 +13,3 @@ override_dh_shlibdeps:
override_dh_strip:
$(overridden_command) --dbg-package=kdepimlibs-dbg
-
-# Inject kdepimlibs-kio-plugins and kdepim-runtime via shlibs as well. Get
-# packages from symbol files
-# Must go below library-packages.mk include due to $(libpkgs_...) usage
-UPSTREAMVERSION := $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: //' | sed 's/^\(.*\)-.*/\1/')
-libs_with_kdepim_runtime := $(shell grep -l 'kdepim-runtime' debian/*.symbols | awk '-F[./]' '{ print $$2 }')
-libs_with_kio_plugins := $(shell grep -l 'kdepimlibs-kio-plugins' debian/*.symbols | awk '-F[./]' '{ print $$2 }')
-comma = ,
-define dh_makeshlibs_with_extra_shlibs
-$(overridden_command) -p$1 -V'$1 (>= $(UPSTREAMVERSION))\
- $(and $(filter $1,$(libs_with_kdepim_runtime)),$(comma) kdepim-runtime)\
- $(and $(filter $1,$(libs_with_kio_plugins)),$(comma) kdepimlibs-kio-plugins)'\
- -- -c0
-
-endef
-
-override_dh_makeshlibs:
- $(foreach p,$(filter $(libs_with_kdepim_runtime) $(libs_with_kio_plugins),$(libpkgs_all_packages)),\
- $(call dh_makeshlibs_with_extra_shlibs,$p))
- $(overridden_command) -V --remaining-packages -- -c0
--
KDE PIM Libraries module packaging
More information about the pkg-kde-commits
mailing list