[Debian-ha-commits] [pacemaker] 58/69: Replace remote RA description patch with upstream proposal

[Christoph Berg]

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

myon pushed a commit to branch debian/master
in repository pacemaker.

commit ac344413c292c89760c01d31c2496fed945415c7
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Wed Jan 13 18:50:59 2016 +0100

    Replace remote RA description patch with upstream proposal
---
 ...tion-to-the-pacemaker_remote-RA-for-prope.patch | 33 ----------------------
 ...he-description-of-the-remote-agent-script.patch | 33 ++++++++++++++++++++++
 debian/patches/series                              |  2 +-
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/debian/patches/Add-description-to-the-pacemaker_remote-RA-for-prope.patch b/debian/patches/Add-description-to-the-pacemaker_remote-RA-for-prope.patch
deleted file mode 100644
index 962b935..0000000
--- a/debian/patches/Add-description-to-the-pacemaker_remote-RA-for-prope.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
-Date: Sun, 13 Sep 2015 19:59:05 +0200
-Subject: Add description to the pacemaker_remote RA for proper man page
- generation
-
-This gets rid of the manpage-has-bad-whatis-entry Lintian warning.
----
- extra/resources/remote |   12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/extra/resources/remote b/extra/resources/remote
-index 447267e..eed1e1f 100644
---- a/extra/resources/remote
-+++ b/extra/resources/remote
-@@ -44,8 +44,16 @@ meta_data() {
- <?xml version="1.0"?>
- <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
- <resource-agent name="remote" version="0.1">
--<version>0.1</version>
--<shortdesc lang="en">remote resource agent</shortdesc>
-+  <version>0.1</version>
-+  <longdesc lang="en">
-+This resource agent provides metadata for the internal
-+pacemaker remote lrmd connection agent.  Outside of acting
-+as a place holder so the remote RA script can be indexed and
-+providing metadata, this script should never be invoked.  The
-+actual functionality behind the remote lrmd connection lives
-+within pacemaker's crmd component.
-+  </longdesc>
-+  <shortdesc lang="en">Provides metadata for the remote connection agent</shortdesc>
-   <parameters>
-     <parameter name="server" unique="1">
-     <longdesc lang="en">
diff --git a/debian/patches/Extend-the-description-of-the-remote-agent-script.patch b/debian/patches/Extend-the-description-of-the-remote-agent-script.patch
new file mode 100644
index 0000000..f5bd2df
--- /dev/null
+++ b/debian/patches/Extend-the-description-of-the-remote-agent-script.patch
@@ -0,0 +1,33 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Sun, 13 Sep 2015 19:59:05 +0200
+Subject: Extend the description of the remote agent script
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Ferenc Wágner <wferi at niif.hu>
+---
+ extra/resources/remote |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/extra/resources/remote b/extra/resources/remote
+index 447267e..b6cb36f 100644
+--- a/extra/resources/remote
++++ b/extra/resources/remote
+@@ -44,8 +44,14 @@ meta_data() {
+ <?xml version="1.0"?>
+ <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
+ <resource-agent name="remote" version="0.1">
+-<version>0.1</version>
+-<shortdesc lang="en">remote resource agent</shortdesc>
++  <version>0.1</version>
++  <shortdesc lang="en">provide metadata for the remote connection agent</shortdesc>
++  <longdesc lang="en">
++This resource agent script only provides the metadata of the internal
++remote lrmd connection agent to announce its parameters.  All other
++operations are unsupported.  The actual functionality lives within the
++crmd component of pacemaker.
++  </longdesc>
+   <parameters>
+     <parameter name="server" unique="1">
+     <longdesc lang="en">
diff --git a/debian/patches/series b/debian/patches/series
index 933152e..b6af1ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,7 @@ libpengine.la-needs-additional-libraries-during-link.patch
 Debianize-crm_mon.service.patch
 Debianize-pacemaker_remote.service.patch
 Synchronize-the-provided-name-with-the-filename.patch
-Add-description-to-the-pacemaker_remote-RA-for-prope.patch
 Restarting-pacemaker-adds-confusion-only.patch
 Enable-redirecting-etc-init.d-script-calls-to-system.patch
 Don-t-override-a-libdir-containing.patch
+Extend-the-description-of-the-remote-agent-script.patch

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