[SCM] libshout/master: Avoid (not only strip dependency_libs from) no longer needed *.la file. Fix avoid invoking d-shlibmove twice.

js at users.alioth.debian.org js at users.alioth.debian.org
Mon Dec 19 07:46:17 UTC 2011


The following commit has been merged in the master branch:
commit 0e0c992507ea61586569cf45e0d3e6b84c4b5f8d
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Dec 19 14:28:28 2011 +0700

    Avoid (not only strip dependency_libs from) no longer needed *.la file. Fix avoid invoking d-shlibmove twice.

diff --git a/debian/rules b/debian/rules
index b0df92c..2438328 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,16 +45,22 @@ DEB_UPSTREAM_TARBALL_MD5 = 4f75fc9901c724b712c371c9a1e782d3
 
 DEB_INSTALL_EXAMPLES_$(devpkgname) = examples/example.c
 
-common-binary-post-install-arch::
-	sed -i "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/$(libname).la
+# avoid unneeded .la file
+binary-post-install/$(libpkgname):: debian/stamp-local-strip-la
+debian/stamp-local-strip-la: binary-install/$(libpkgname)
+	find debian -type f -name '*.la' -delete
+	touch $@
+clean::
+	rm -f debian/stamp-local-strip-la
 
 # 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)
+debian/stamp-local-shlibs-$(libname): binary-install/$(libpkgname) debian/stamp-local-strip-la
 	d-shlibmove --commit \
 		--override s/ld1-dev// \
 		--movedev "debian/tmp/usr/include/*" usr/include/ \
 		debian/tmp/usr/lib/$(libname).so
+	touch $@
 clean::
 	rm -f debian/stamp-local-shlibs-$(libname)

-- 
libshout packaging



More information about the pkg-multimedia-commits mailing list