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

[myon at debian.org]

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

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

commit 6cc267c255e3fbacc8c13e29d0e74592e8039daf
Author: Christoph Berg <myon at debian.org>
Date:   Sat Sep 12 20:11:13 2015 +0200

    New upstream version.
---
 debian/changelog                                   |  6 +++++
 debian/control                                     |  2 +-
 ...fix-virsh-man-page-unexpected-special-character | 28 ----------------------
 debian/patches/series                              |  1 -
 4 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 71247e3..96221e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+fence-agents (4.0.21-1) unstable; urgency=medium
+
+  * New upstream version.
+
+ -- Christoph Berg <myon at debian.org>  Sat, 12 Sep 2015 18:42:15 +0200
+
 fence-agents (4.0.19-1) unstable; urgency=medium
 
   [ Adrian Vondendriesch ]
diff --git a/debian/control b/debian/control
index 91fc2e9..79ee7fc 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: Debian HA Maintainers <debian-ha-maintainers at lists.alioth.debian.org>
 Uploaders: Martin Loschwitz <madkiss at debian.org>,
-           Christoph Berg <christoph.berg at credativ.de>,
+           Christoph Berg <myon at debian.org>,
            Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
 Build-Depends: autoconf,
                automake,
diff --git a/debian/patches/fix-virsh-man-page-unexpected-special-character b/debian/patches/fix-virsh-man-page-unexpected-special-character
deleted file mode 100644
index 518d458..0000000
--- a/debian/patches/fix-virsh-man-page-unexpected-special-character
+++ /dev/null
@@ -1,28 +0,0 @@
-Genereated fence_virsh.8 had errors:
-  "warning: can't find special character EXPECT\'"
-wich are fixed by this patch.
-
-This bug is reported upstream and a fix is hopefully included within the next
-release of fence-agents.
---- a/fence/agents/virsh/fence_virsh.py
-+++ b/fence/agents/virsh/fence_virsh.py
-@@ -74,7 +74,7 @@
- 
- 	all_opt["secure"]["default"] = "1"
- 	all_opt["cmd_prompt"]["default"] = [r"\[EXPECT\]#\ "]
--	all_opt["ssh_options"]["default"] = "-t '/bin/bash -c \"" + r"PS1=\[EXPECT\]#\  " + "/bin/bash --noprofile --norc\"'"
-+	all_opt["ssh_options"]["default"] = "-t '/bin/bash -c \"" + r"PS1=\\[EXPECT\\]#\  " + "/bin/bash --noprofile --norc\"'"
- 
- 	options = check_input(device_opt, process_input(device_opt))
- 
---- a/tests/data/metadata/fence_virsh.xml
-+++ b/tests/data/metadata/fence_virsh.xml
-@@ -67,7 +67,7 @@
- 	</parameter>
- 	<parameter name="ssh_options" unique="0" required="0">
- 		<getopt mixed="--ssh-options=[options]" />
--		<content type="string" default="-t '/bin/bash -c "PS1=\[EXPECT\]#\  /bin/bash --noprofile --norc"'"  />
-+		<content type="string" default="-t '/bin/bash -c "PS1=\\[EXPECT\\]#\  /bin/bash --noprofile --norc"'"  />
- 		<shortdesc lang="en">SSH options to use</shortdesc>
- 	</parameter>
- 	<parameter name="verbose" unique="0" required="0">
diff --git a/debian/patches/series b/debian/patches/series
index 2c9d697..cfc3eb4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 reproducible
-fix-virsh-man-page-unexpected-special-character

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