[Debian-ha-commits] [resource-agents] 03/03: Add shebang line to runocft

[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 c6b7c98f68552420a04c9443e152e4203115296c
Author: Christoph Berg <myon at debian.org>
Date:   Sat Feb 13 11:59:12 2016 +0100

    Add shebang line to runocft
    
    * New upstream release.
    * Add shebang line to runocft.
---
 debian/changelog                       |  7 +++++++
 debian/patches/02_spelling_fixes.patch | 33 +++++++++------------------------
 debian/patches/runocft                 |  8 ++++++++
 debian/patches/series                  |  1 +
 4 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c58415f..3932f71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+resource-agents (1:3.9.7-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Add shebang line to runocft.
+
+ -- Christoph Berg <myon at debian.org>  Sat, 13 Feb 2016 11:49:44 +0100
+
 resource-agents (1:3.9.6-2) unstable; urgency=medium
 
   * Fix arch-all build by not attempting to fix the findif.sh permissions.
diff --git a/debian/patches/02_spelling_fixes.patch b/debian/patches/02_spelling_fixes.patch
index 0a810ea..2492ed8 100644
--- a/debian/patches/02_spelling_fixes.patch
+++ b/debian/patches/02_spelling_fixes.patch
@@ -1,19 +1,6 @@
-diff -ruN ClusterLabs-resource-agents-dc69db5.orig/heartbeat/LVM ClusterLabs-resource-agents-dc69db5/heartbeat/LVM
---- ClusterLabs-resource-agents-dc69db5.orig/heartbeat/LVM	2012-10-05 19:27:22.000000000 +0000
-+++ ClusterLabs-resource-agents-dc69db5/heartbeat/LVM	2012-10-09 11:23:01.081836865 +0000
-@@ -83,7 +83,7 @@
- <parameter name="partial_activation" unique="0" required="0">
- <longdesc lang="en">
- If set, the volume group will be activated even only partial of the physical
--volumes available. It helps to set to true, when you are using mirroring
-+volumes available. It helps one to set to true, when you are using mirroring
- logical volumes.
- </longdesc>
- <shortdesc lang="en">Activate VG even with partial PV only</shortdesc>
-diff -ruN ClusterLabs-resource-agents-dc69db5.orig/heartbeat/nfsserver ClusterLabs-resource-agents-dc69db5/heartbeat/nfsserver
---- ClusterLabs-resource-agents-dc69db5.orig/heartbeat/nfsserver	2012-10-05 19:27:22.000000000 +0000
-+++ ClusterLabs-resource-agents-dc69db5/heartbeat/nfsserver	2012-10-09 11:23:01.081836865 +0000
-@@ -24,7 +24,7 @@
+--- a/heartbeat/nfsserver
++++ b/heartbeat/nfsserver
+@@ -39,7 +39,7 @@ nfsserver_meta_data() {
  <version>1.0</version>
  
  <longdesc lang="en">
@@ -22,10 +9,9 @@ diff -ruN ClusterLabs-resource-agents-dc69db5.orig/heartbeat/nfsserver ClusterLa
  It depends on Linux specific NFS implementation details, so is considered not portable to other platforms yet.
  </longdesc>
  
-diff -ruN ClusterLabs-resource-agents-dc69db5.orig/heartbeat/nginx ClusterLabs-resource-agents-dc69db5/heartbeat/nginx
---- ClusterLabs-resource-agents-dc69db5.orig/heartbeat/nginx	2012-10-05 19:27:22.000000000 +0000
-+++ ClusterLabs-resource-agents-dc69db5/heartbeat/nginx	2012-10-09 11:23:01.081836865 +0000
-@@ -721,7 +721,7 @@
+--- a/heartbeat/nginx
++++ b/heartbeat/nginx
+@@ -721,7 +721,7 @@ Case insensitive.
  Client to use to query to Nginx for level 10 and level 20 tests.
  If not specified, the RA will try to find one on the system.
  Currently, wget and curl are supported, with curl being preferred.
@@ -34,10 +20,9 @@ diff -ruN ClusterLabs-resource-agents-dc69db5.orig/heartbeat/nginx ClusterLabs-r
  </longdesc>
  <shortdesc lang="en">http client</shortdesc>
  <content type="string" />
-diff -ruN ClusterLabs-resource-agents-dc69db5.orig/heartbeat/scsi2reservation ClusterLabs-resource-agents-dc69db5/heartbeat/scsi2reservation
---- ClusterLabs-resource-agents-dc69db5.orig/heartbeat/scsi2reservation	2012-10-05 19:27:22.000000000 +0000
-+++ ClusterLabs-resource-agents-dc69db5/heartbeat/scsi2reservation	2012-10-09 11:23:01.081836865 +0000
-@@ -35,7 +35,7 @@
+--- a/heartbeat/scsi2reservation
++++ b/heartbeat/scsi2reservation
+@@ -35,7 +35,7 @@ scsi-2 reservation
  <parameter name="scsi_reserve" unique="0" required="0">
  <longdesc lang="en">
  The scsi_reserve is a command from scsires package. 
diff --git a/debian/patches/runocft b/debian/patches/runocft
new file mode 100644
index 0000000..b2807e5
--- /dev/null
+++ b/debian/patches/runocft
@@ -0,0 +1,8 @@
+--- a/tools/ocft/runocft
++++ b/tools/ocft/runocft
+@@ -1,3 +1,5 @@
++#!/bin/sh
++
+ OCFTDIR=/usr/share/resource-agents/ocft
+ CONFDIR=$OCFTDIR/configs
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 4269bad..a467edb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02_spelling_fixes.patch
 mysql-path.patch
 no-dirty-version
+runocft

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