[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1%1.16.18-1-89-g6038ece

[Hilko Bengen]

The following commit has been merged in the master branch:
commit 489a18279a672771c72ebc0cb3ae71e413ea6996
Author: Hilko Bengen <bengen at debian.org>
Date:   Fri Dec 21 13:41:48 2012 +0100

    Simplified dh_install target

diff --git a/debian/rules b/debian/rules
index d4feb6b..91489b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -121,18 +121,6 @@ override_dh_auto_install:
 	done
 
 override_dh_install:
-	rm -f debian/tmp/usr/lib/python*/dist-packages/libguestfsmod.la
-
-# Workaround for:
-# W: libguestfs-perl: script-not-executable usr/lib/perl5/Sys/bindtests.pl
-	rm -f debian/tmp/usr/lib/perl5/Sys/bindtests.pl
-
-	rm -f debian/tmp/usr/lib/ocaml/stublibs/*.so.owner
-
-# Workaround for:
-# E: libguestfs-dev: non-empty-dependency_libs-in-la-file usr/lib/libguestfs.la
-	find debian/tmp -name *.la | xargs sed -i '/^dependency_libs/ s/^/# /'
-
 # We do not install supermin.d/base.img, but ship make.sh which can be
 # used to build it.
 	mkdir -p debian/tmp/usr/lib/guestfs/supermin.d
@@ -146,7 +134,10 @@ override_dh_install:
 		debian/tmp/usr/lib/guestfs/supermin.d/
 
 	erlang-depends -perlang-guestfs
-	dh_install --fail-missing
+# Workarounds for:
+# W: libguestfs-perl: script-not-executable usr/lib/perl5/Sys/bindtests.pl
+# E: libguestfs-dev: non-empty-dependency_libs-in-la-file
+	dh_install -X.la -Xbindtests -X.so.owner --fail-missing
 
 # Workaround for python3-defaults < 3.2~b2-1
 # ("do not rename .so files outside dist-packages directory")

-- 
Libguestfs Debian packaging