[Debian-ha-commits] [fence-agents] 03/04: New upstream version.

[Christoph Berg]

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

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

commit e5c551c39acf99ce3ecfce00ab9996a49a407d8a
Author: Christoph Berg <christoph.berg at credativ.de>
Date:   Wed Jul 6 15:17:30 2016 +0200

    New upstream version.
    
    Disable the new fence_amt_ws agent because we don't have openwsman
    (and sblim-sfcc) in Debian yet
---
 debian/changelog                   |  5 ++++-
 debian/patches/fence_zvm-help      | 11 -----------
 debian/patches/remove-fence_amt_ws | 22 ++++++++++++++++++++++
 debian/patches/series              |  2 +-
 debian/rules                       |  2 +-
 5 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1e009b6..b5713c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
-fence-agents (4.0.22-4) UNRELEASED; urgency=medium
+fence-agents (4.0.23-1) unstable; urgency=medium
 
+  * New upstream version.
+  * Disable the new fence_amt_ws agent because we don't have openwsman
+    (and sblim-sfcc) in Debian yet
   * Include list of agents in package description.
 
  -- Christoph Berg <christoph.berg at credativ.de>  Wed, 06 Jul 2016 13:33:49 +0200
diff --git a/debian/patches/fence_zvm-help b/debian/patches/fence_zvm-help
deleted file mode 100644
index 4be48cd..0000000
--- a/debian/patches/fence_zvm-help
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/fence/agents/zvm/fence_zvm.c
-+++ b/fence/agents/zvm/fence_zvm.c
-@@ -853,7 +853,7 @@ usage()
- 		"\t-T --timeout [secs]  - Time to wait for fence in seconds - currently ignored\n"
- 		"\t--zvmsys [node]      - z/VM Node on which SMAPI server lives\n"
- 		"\t-h --help            - Display this usage information\n");
--	return(1);
-+	return(0);
- }
- 
- /**
diff --git a/debian/patches/remove-fence_amt_ws b/debian/patches/remove-fence_amt_ws
new file mode 100644
index 0000000..3220608
--- /dev/null
+++ b/debian/patches/remove-fence_amt_ws
@@ -0,0 +1,22 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -142,6 +142,9 @@ if test "x$AGENTS_LIST" = xall; then
+ 	AGENTS_LIST=`find $srcdir/fence/agents -mindepth 2 -maxdepth 2 -name '*.py' -printf '%P ' | sed -e 's#lib/[A-Za-z_.]* ##g' -e 's#nss_wrapper/[A-Za-z_.]* ##g' -e 's#autodetect/[A-Za-z_.]* ##g'`
+ fi
+ 
++# remove fence_amt_ws because we don't have openwsman (and sblim-sfcc) in Debian
++AGENTS_LIST=$(echo $AGENTS_LIST | sed -e "s!amt_ws/fence_amt_ws.py !!")
++
+ XENAPILIB=0
+ if echo "$AGENTS_LIST" | grep -q xenapi; then
+ 	XENAPILIB=1
+@@ -163,7 +166,8 @@ AC_PYTHON_MODULE(suds, 1)
+ AC_PYTHON_MODULE(pexpect, 1)
+ AC_PYTHON_MODULE(pycurl, 1)
+ AC_PYTHON_MODULE(requests, 1)
+-AC_PYTHON_MODULE(pywsman, 1)
++# openwsman is not in Debian yet
++#AC_PYTHON_MODULE(pywsman, 1)
+ 
+ ## path to 3rd-party binaries
+ AC_PATH_PROG([IPMITOOL_PATH], [ipmitool], [/usr/bin/ipmitool])
diff --git a/debian/patches/series b/debian/patches/series
index 5153f79..ca7a263 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 reproducible
 vgs-path
 fence_zvm.h
-fence_zvm-help
+remove-fence_amt_ws
diff --git a/debian/rules b/debian/rules
index 4a7f21a..e1188dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ override_dh_install:
 	rmdir debian/tmp/usr/share/doc/fence-agents
 ifneq ($(shell dpkg-architecture -qDEB_HOST_ARCH),s390x)
 	# remove fence_zvm because it doesn't do anything except on 390x
-	rm -v debian/tmp/usr/sbin/fence_zvm debian/tmp/usr/share/man/man8/fence_zvm.8
+	rm -v debian/tmp/usr/sbin/fence_zvm
 endif
 	dh_install --fail-missing
 	# test agents (skip ack_manual, it doesn't have --help, skip vmware_helper, it wants VIRuntime.pm)

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