[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.11.4-26-g37aaf45

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 0b1f43c057091146e32b1a8a1591633dfc6f3942
Author: Modestas Vainius <modax at debian.org>
Date:   Wed Apr 6 00:59:57 2011 +0300

    Make libpkgs_gen_strict_local_shlibs independant from DEBIAN/*/shlibs.
    
    qt-kde-team/2/library-packages.mk: libpkgs_gen_strict_local_shlibs no longer
    depends on the presence of the respective DEBIAN/*/shlibs.
---
 debian/changelog                  |    2 ++
 qt-kde-team/2/library-packages.mk |   22 +++++++++-------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b01d423..6e06522 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ pkg-kde-tools (0.12.0~pre8) UNRELEASED; urgency=low
     spelling). But keep 'overriden_command' as an alias for now.
   * Switch debian/rules engine to home-grown dhmk. This might help to
     detect regressions and might ease testing and development process.
+  * qt-kde-team/2/library-packages.mk: libpkgs_gen_strict_local_shlibs no
+    longer depends on the presence of the respective DEBIAN/*/shlibs.
 
  -- Modestas Vainius <modax at debian.org>  Thu, 31 Mar 2011 00:51:03 +0300
 
diff --git a/qt-kde-team/2/library-packages.mk b/qt-kde-team/2/library-packages.mk
index e8b3dd0..1aca45d 100644
--- a/qt-kde-team/2/library-packages.mk
+++ b/qt-kde-team/2/library-packages.mk
@@ -37,19 +37,15 @@ endif
 # Generate strict local shlibs if requested
 ifneq (,$(libpkgs_gen_strict_local_shlibs))
 
+libpkgs_gen_strict_local_shlibs: libpkgs_re = $(subst \|_ ,\|,$(patsubst %,%\|_,$(libpkgs_gen_strict_local_shlibs)))
 libpkgs_gen_strict_local_shlibs:
-	for pkg in $(libpkgs_gen_strict_local_shlibs); do \
-	    if test -e debian/$$pkg/DEBIAN/shlibs; then \
-	        echo "Generating strict local shlibs for the '$$pkg' package ..."; \
-		    sed 's/>=[^)]*/= $(libpkgs_binver)/' debian/$$pkg/DEBIAN/shlibs >> debian/shlibs.local; \
-	    fi; \
-	done
-
-libpkgs_clean_local_shlibs:
-	rm -f debian/shlibs.local
-
-$(foreach t,binary-arch binary,post_$(t)_dh_makeshlibs): libpkgs_gen_strict_local_shlibs
-post_clean: libpkgs_clean_local_shlibs
-.PHONY: libpkgs_gen_strict_local_shlibs libpkgs_clean_local_shlibs
+	set -e; \
+	if [ -n "`ls debian/*.substs 2>/dev/null`" ]; then \
+	    echo "Generating strict local shlibs on packages: $(libpkgs_gen_strict_local_shlibs)"; \
+	    sed -i '/^shlibs:Depends=/{ s/\(^shlibs:Depends=[[:space:]]*\|,[[:space:]]*\)\($(libpkgs_re)\)[[:space:]]*([[:space:]]*>=[^)]\+)/\1\2 (= $(libpkgs_binver))/g }' debian/*.substs; \
+    fi
+
+$(foreach t,binary-arch binary,post_$(t)_dh_shlibdeps): libpkgs_gen_strict_local_shlibs
+.PHONY: libpkgs_gen_strict_local_shlibs
 
 endif

-- 
Debian Qt/KDE packaging tools