[Pkg-libvirt-commits] [libvirt] 01/03: Don't pretend kFreeBSD supports linux only features

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to annotated tag debian/1.2.4-3
in repository libvirt.

commit b0b73593ce59982caae578c1e8400110b557ef1c
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sat May 10 20:35:16 2014 +0200

    Don't pretend kFreeBSD supports linux only features
    
    So far we worked around missing kFreeBSD features by creating empty dirs
    this looks bad on the target systems and makes us maintain things in
    debian rules and *.install. Explicitly invoke dh_install in debian/rules
    instead.
---
 debian/libvirt-bin.install |  4 ----
 debian/rules               | 21 ++++++++-------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/debian/libvirt-bin.install b/debian/libvirt-bin.install
index 7b7e9ee..298bdb7 100644
--- a/debian/libvirt-bin.install
+++ b/debian/libvirt-bin.install
@@ -2,12 +2,8 @@ usr/bin/*
 usr/sbin/*
 etc/libvirt/*
 etc/sasl2/*
-etc/apparmor.d
-usr/share/polkit-1
 usr/lib/libvirt/libvirt*
 usr/lib/libvirt/connection-driver
 usr/share/augeas/*
 usr/share/libvirt/*
 usr/share/man/man8/*
-usr/lib/systemd/system lib/systemd/
-usr/share/systemtap
diff --git a/debian/rules b/debian/rules
index 12c4847..3c83144 100755
--- a/debian/rules
+++ b/debian/rules
@@ -121,19 +121,6 @@ EXAMPLES_DIR = $(CURDIR)/debian/libvirt-doc/usr/share/doc/libvirt-doc/examples/
 override_dh_auto_configure:
 	dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_ARGS)
 
-override_dh_auto_install:
-	dh_auto_install
-ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
-	# Only linux has app-armor
-	dh_install -p libvirt-bin usr/lib/libvirt/virt-aa-helper
-endif
-	# Add empty dirs so dh_install doesn't fail on kFreebsd until we have
-	# Polkit/Systemd/systemtap/apparmor support
-	mkdir -p debian/tmp/usr/share/polkit-1 \
-	         debian/tmp/lib/systemd/system \
-	         debian/tmp/usr/share/systemtap \
-	         debian/tmp/etc/apparmor.d/
-
 override_dh_auto_test:
 	export LD_PRELOAD="";     \
 	export VIR_TEST_DEBUG=1;  \
@@ -152,8 +139,16 @@ override_dh_install:
 	cp tools/libvirt-guests.sysconf \
 	    debian/libvirt-bin.libvirt-guests.default
 ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
+	# Linux supports more nice things:
+	dh_install -p libvirt-bin usr/lib/systemd/system lib/systemd/
 	mv debian/libvirt-bin/lib/systemd/system/libvirtd.service \
 	   debian/libvirt-bin/lib/systemd/system/libvirt-bin.service
+	dh_install -p libvirt-bin usr/lib/libvirt/virt-aa-helper
+	dh_install -p libvirt-bin etc/apparmor.d
+	dh_install -p libvirt-bin usr/share/polkit-1
+	# Not all linux arches have systemtap yet
+	mkdir -p debian/tmp/usr/share/systemtap
+	dh_install -p libvirt-bin usr/share/systemtap
 endif
 
 	for l in $(LOGROTATE); do \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git