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

[Adrian Vondendriesch]

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

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

commit c8cd02fd58abc79cc15506e6becd5b5440a0ded9
Author: Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
Date:   Fri Jul 3 11:46:37 2015 +0200

    New upstream version.
    
    * New upstream version.
    * Remove obsolete patch "fix-agents".
    * Add myself to uploaders.
    
    Signed-off-by: Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
---
 debian/changelog          |  8 ++++++++
 debian/control            |  4 +++-
 debian/patches/fix-agents | 39 ---------------------------------------
 debian/patches/series     |  1 -
 4 files changed, 11 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b3ee12a..f80795d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+fence-agents (4.0.19-1) UNRELEASED; urgency=medium
+
+  * New upstream version.
+  * Remove obsolete "fix-agents" patch. Changes are merged upstream.
+  * Add myself to uploaders.
+
+ -- Adrian Vondendriesch <adrian.vondendriesch at credativ.de>  Fri, 03 Jul 2015 08:41:42 +0200
+
 fence-agents (4.0.18-1) unstable; urgency=medium
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index 8431f8b..91fc2e9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,9 @@ Source: fence-agents
 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>
+Uploaders: Martin Loschwitz <madkiss at debian.org>,
+           Christoph Berg <christoph.berg at credativ.de>,
+           Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
 Build-Depends: autoconf,
                automake,
                autotools-dev,
diff --git a/debian/patches/fix-agents b/debian/patches/fix-agents
deleted file mode 100644
index 03ab2c7..0000000
--- a/debian/patches/fix-agents
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/fence/agents/lpar/fence_lpar.py
-+++ b/fence/agents/lpar/fence_lpar.py
-@@ -144,8 +144,8 @@ def main():
- 	if not options.has_key("--managed"):
- 		fail_usage("Failed: You have to enter name of managed system")
- 
--        if options["--action"] == "validate-all":
--                sys.exit(0)
-+	if options["--action"] == "validate-all":
-+		sys.exit(0)
- 
- 	##
- 	## Operate the fencing device
---- a/fence/agents/mpath/fence_mpath.py
-+++ b/fence/agents/mpath/fence_mpath.py
-@@ -231,8 +231,8 @@ longer be able to write to the device(s)
- 	if not "--key" in options:
- 		fail_usage("Failed: key is required")
- 
--        if options["--action"] == "validate-all":
--                sys.exit(0)
-+	if options["--action"] == "validate-all":
-+		sys.exit(0)
- 
- 	options["devices"] = options["--devices"].split(",")
- 
---- a/fence/agents/zvm/fence_zvmip.py
-+++ b/fence/agents/zvm/fence_zvmip.py
-@@ -144,8 +144,8 @@ def main():
- 	if len(options.get("--plug", "")) > 8:
- 		fail_usage("Failed: Name of image can not be longer than 8 characters")
- 
--        if options["--action"] == "validate-all":
--                sys.exit(0)
-+	if options["--action"] == "validate-all":
-+		sys.exit(0)
- 
- 	docs = {}
- 	docs["shortdesc"] = "Fence agent for use with z/VM Virtual Machines"
diff --git a/debian/patches/series b/debian/patches/series
index 965c8f3..cfc3eb4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 reproducible
-fix-agents

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