[SCM] libshout/master: Improve d-shlibs handling: Ensure invoked only once. Drop superfluously invoking d-devlibdeps (done implicitly by d-shlibmove). Add local ld1-dev quirk and relax to build-depend unversioned on d-shlibs, to ease backporting.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ebfe206689d7c6f8153f4f5a9ba660de8996b269
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Dec 6 19:13:12 2011 +0700

    Improve d-shlibs handling: Ensure invoked only once. Drop superfluously invoking d-devlibdeps (done implicitly by d-shlibmove). Add local ld1-dev quirk and relax to build-depend unversioned on d-shlibs, to ease backporting.

diff --git a/debian/rules b/debian/rules
index ab5d7c2..fd29c0e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ devpkgname = lib$(stem)$(abi)-dev
 CDBS_BUILD_DEPENDS += , libogg-dev, libvorbis-dev, pkg-config, libtheora-dev, libspeex-dev
 
 # Needed at build time for our packaging
-CDBS_BUILD_DEPENDS += , d-shlibs (>= 0.48)
+CDBS_BUILD_DEPENDS += , d-shlibs
 
 # suppress optional build-dependencies
 CDBS_BUILD_DEPENDS_rules_upstream-tarball =
@@ -31,9 +31,16 @@ DEB_UPSTREAM_TARBALL_MD5 = 4f75fc9901c724b712c371c9a1e782d3
 
 DEB_INSTALL_EXAMPLES_$(devpkgname) = examples/example.c
 
-# Let d-shlibs calculate development package dependencies
-#  and handle shared library install
 common-binary-post-install-arch::
 	sed -i "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/$(libname).la
-	d-devlibdeps debian/$(devpkgname).substvars debian/tmp/usr/lib/$(libname).so
-	d-shlibmove --commit --movedev "debian/tmp/usr/include/*" usr/include/ debian/tmp/usr/lib/$(libname).so
+
+# Let d-shlibs calculate development package dependencies
+#  and handle shared library install
+binary-post-install/$(libpkgname):: debian/stamp-local-shlibs-$(libname)
+debian/stamp-local-shlibs-$(libname): binary-install/$(libpkgname)
+	d-shlibmove --commit \
+		--override s/ld1-dev// \
+		--movedev "debian/tmp/usr/include/*" usr/include/ \
+		debian/tmp/usr/lib/$(libname).so
+clean::
+	rm -f debian/stamp-local-shlibs-$(libname)

-- 
libshout packaging