[Debian-ha-commits] [resource-agents] 02/03: Use dh-exec to install ldirectord.service and sfex* on Linux only

[Christoph Berg]

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

myon pushed a commit to branch master
in repository resource-agents.

commit 0d338c29c8af20721326fc4cb371c99e11470f3d
Author: Christoph Berg <myon at debian.org>
Date:   Fri Apr 8 21:29:55 2016 +0200

    Use dh-exec to install ldirectord.service and sfex* on Linux only
---
 debian/changelog               | 3 ++-
 debian/control                 | 3 ++-
 debian/ldirectord.install      | 4 +++-
 debian/resource-agents.install | 8 +++++---
 debian/rules                   | 4 +---
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9857c16..1b021dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-resource-agents (1:3.9.7-3) UNRELEASED; urgency=medium
+resource-agents (1:3.9.7-3) unstable; urgency=medium
 
   * Disable IPv6addr and send_ua on non-Linux, they need SIOCSIFADDR and
     SIOGIFINDEX.
+  * Use dh-exec to install ldirectord.service and sfex* on Linux only.
 
  -- Christoph Berg <myon at debian.org>  Fri, 08 Apr 2016 21:19:58 +0200
 
diff --git a/debian/control b/debian/control
index 86efc22..39edf12 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends: autoconf,
                autotools-dev,
                cluster-glue-dev,
                debhelper (>= 9),
+               dh-exec,
                dh-systemd,
                docbook-xml,
                docbook-xsl,
@@ -23,7 +24,7 @@ Build-Depends: autoconf,
                pkg-config,
                python,
 #              for systemd.pc:
-               systemd,
+               systemd [linux-any],
                xsltproc
 Standards-Version: 3.9.7
 Homepage: https://github.com/ClusterLabs/resource-agents
diff --git a/debian/ldirectord.install b/debian/ldirectord.install
old mode 100644
new mode 100755
index 180cc6d..0d97d50
--- a/debian/ldirectord.install
+++ b/debian/ldirectord.install
@@ -1,7 +1,9 @@
+#!/usr/bin/dh-exec
+
 debian/ldirectord.cf /etc/ha.d
 etc/ha.d/resource.d/ldirectord
 etc/init.d/ldirectord
 etc/logrotate.d/ldirectord
-lib/systemd/system/
+lib/systemd/system/ [linux-any]
 usr/sbin/ldirectord
 usr/share/man/man8/ldirectord.8
diff --git a/debian/resource-agents.install b/debian/resource-agents.install
old mode 100644
new mode 100755
index 903eea6..7fc202b
--- a/debian/resource-agents.install
+++ b/debian/resource-agents.install
@@ -1,3 +1,5 @@
+#!/usr/bin/dh-exec
+
 etc/ha.d/shellfuncs
 usr/include
 usr/lib/heartbeat
@@ -5,11 +7,11 @@ usr/lib/ocf
 usr/sbin/ocft
 usr/sbin/ocf-tester
 usr/sbin/rhev-check.sh
-usr/sbin/sfex_init
-usr/sbin/sfex_stat
+usr/sbin/sfex_init [linux-any]
+usr/sbin/sfex_stat [linux-any]
 usr/share/cluster
 usr/share/doc/resource-agents
 usr/share/man/man7/*
 usr/share/man/man8/ocf-tester.8
-usr/share/man/man8/sfex_init.8
+usr/share/man/man8/sfex_init.8 [linux-any]
 usr/share/resource-agents
diff --git a/debian/rules b/debian/rules
index a5e69ea..6768a0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ get-orig-source:
 	uscan --noconf --force-download --rename --repack --download-current-version --destdir=/
 
 %:
-	dh $@ --with=systemd
+	dh $@ --with=systemd --fail-missing
 
 override_dh_auto_configure:
 	dh_testdir
@@ -27,8 +27,6 @@ override_dh_auto_install:
 	rm $(CURDIR)/debian/tmp/usr/share/cluster/drbd.metadata
 	rm $(CURDIR)/debian/tmp/usr/share/cluster/drbd.sh
 
-	dh_install --fail-missing
-
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -f .version .tarball-version

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/resource-agents.git