[SCM] KDE PIM module packaging branch, master, updated. debian/4.10.5-1

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim.git;a=commitdiff;h=14024fc

The following commit has been merged in the master branch:
commit 14024fcba4e4c2013429fbc7effb245e4dc45636
Author: Modestas Vainius <modax at debian.org>
Date:   Fri Jun 22 20:55:48 2012 +0300

    Tighten dependency on kdepim-runtime to >= 4:4.8.
---
 debian/changelog |    2 +-
 debian/rules     |   10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7e2d34a..9af3292 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
 kdepim (4:4.8.4-0r1) UNRELEASED; urgency=low
 
   * TODO: copyright, package descriptions,
-          figure out how to pull kdepim-runtime 4:4.6 (Breaks maybe?).
 
   * New upstream release.
 
@@ -46,6 +45,7 @@ kdepim (4:4.8.4-0r1) UNRELEASED; urgency=low
   * Add ${perl:Depends} to libkpgp4 Depends.
   * Bump Standards-Version to 3.9.3:
     - switch kdepim metapackage to the new metapackages section.
+  * Tighten dependency on kdepim-runtime to >= 4:4.8.
 
   [ José Manuel Santamaría Lema ]
   * Bump kde-sc-dev-latest build dependency to 4:4.8.4.
diff --git a/debian/rules b/debian/rules
index fd8cd31..ada6ac7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+KDEPIM_RUNTIME_VERSION = 4:4.8
+
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
 include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
@@ -15,3 +17,11 @@ override_dh_makeshlibs:
 
 override_dh_strip:
 	$(overridden_command) --dbg-package=kdepim-dbg
+
+override_dh_shlibdeps:
+	$(overridden_command)
+	set -e; \
+	if [ -n "`ls debian/*.substvars 2>/dev/null`" ]; then \
+	    echo "Tightening dependency on kdepim-runtime to (>= $(KDEPIM_RUNTIME_VERSION)"; \
+	    sed -i '/^shlibs:[^=]\+=/{ s/\(^shlibs:[^=]\+=[[:space:]]*\|,[[:space:]]*\)\(kdepim-runtime\)\([[:space:]]*([[:space:]]*[><=]\+[^)]\+)\)\?/
 (>= $(KDEPIM_RUNTIME_VERSION))/g }' debian/*.substvars; \
+    fi

-- 
KDE PIM module packaging