Merging debian version 4.12.1-2~exp1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 5 insertions, 27 deletions

diff --git a/debian/rules b/debian/rules
index 56ca903..68d5ce6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,26 +40,14 @@ override_dh_install:
 	rm -v debian/tmp/usr/share/doc/fence-agents/COPY*
 	rm -v debian/tmp/usr/share/doc/fence-agents/README.licence
 	rmdir debian/tmp/usr/share/doc/fence-agents
-ifneq ($(DEB_HOST_ARCH),s390x)
-	# remove fence_zvm because it doesn't do anything except on 390x
-	rm -v debian/tmp/usr/sbin/fence_zvm
-	rm -v debian/tmp/usr/share/man/man8/fence_zvm.8
-endif
 	dh_install
-	# test agents (skip ack_manual, it doesn't have --help, skip vmware_helper, it wants VIRuntime.pm)
+	install -m 755 -D agents/vmware/fence_vmware_helper.pl debian/fence-agents-vmware/usr/libexec/fence-agents/fence_vmware_helper
 	# we test in tmp after install so the .pyc files generated don't make it into the package
-	for agent in debian/tmp/usr/sbin/*; do \
-		case $${agent##*/} in fence_ack_manual|fence_vmware_helper|fence_virt) continue;; esac; \
+	for agent in debian/*/usr/sbin/*; do \
+		case $${agent##*/} in fence_ack_manual|fence_virt*|fence_xvm) continue;; esac; \
 		echo "Testing $$agent"; \
 		PYTHONPATH=debian/tmp/usr/share/fence $$agent --help >/dev/null || exit; \
 	done
-	# fence_virt is in a separate package
-	rm -v debian/fence-agents/usr/sbin/fence_virt
-	rm -v debian/fence-agents/usr/sbin/fence_virtd
-	rm -v debian/fence-agents/usr/sbin/fence_xvm
-	rm -v debian/fence-agents/usr/share/man/man8/fence_virt.8
-	rm -v debian/fence-agents/usr/share/man/man8/fence_virtd.8
-	rm -v debian/fence-agents/usr/share/man/man8/fence_xvm.8
 
 # tests are slow and require network access so moved to debian/tests/{delay,metadata}
 override_dh_auto_test:
@@ -78,16 +66,6 @@ override_dh_installinit:
 
 override_dh_missing:
 	rm debian/tmp/usr/lib/*/fence-virt/*.*a
-	dh_missing --fail-missing
+	rm -r debian/tmp/usr/share/fence/__pycache__
 
-override_dh_gencontrol:
-	# extract agent descriptions for use in debian/control
-	export LC_ALL=C; \
-	( echo -n "agents="; \
-	  sed -ne 's/<resource-agent name="\(.*\)" shortdesc="\(.*\)".*/\1: \2/p' tests/data/metadata/*.xml | \
-	  sed -e 's/\(I.O \)\?\(Fence\|Fencing\) agent for //' | \
-	  grep -v 'fence_amt_ws:\|fence_virt:' | \
-	  while read line; do echo -n " $$line\$${Newline}"; done ; \
-	  echo ; \
-	) >> debian/fence-agents.substvars
-	dh_gencontrol
+	dh_missing --fail-missing