[Debian-ha-commits] [fence-agents] 01/01: Tune debian/rules, install upstream docs.

[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 0636af499f21f3e490d38c27a0f1044c40677383
Author: Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
Date:   Sat Jul 11 12:17:06 2015 +0200

    Tune debian/rules, install upstream docs.
    
    * Add "--fail-missing" to debian/rules
    * Install upstream documentation files, except COPYING.{applications,libraries}
    * Add fix-virsh-man-page-unexpected-special-character patch to prevent nroff
      related lintian errors
    
    Signed-off-by: Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
---
 debian/changelog                                        |  7 ++++++-
 debian/fence-agents.install                             |  5 +++--
 .../fix-virsh-man-page-unexpected-special-character     | 17 +++++++++++++++++
 debian/patches/series                                   |  1 +
 debian/rules                                            |  6 ++++--
 5 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f80795d..fdc52bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-fence-agents (4.0.19-1) UNRELEASED; urgency=medium
+fence-agents (4.0.19-1) unstable; urgency=medium
 
   * New upstream version.
   * Remove obsolete "fix-agents" patch. Changes are merged upstream.
   * Add myself to uploaders.
+  * Add "--fail-missing" to debian/rules.
+  * Install upstream documentation files, except
+    COPYING.{applications,libraries}.
+  * Add fix-virsh-man-page-unexpected-special-character patch to prevent nroff
+    related lintian errors.
 
  -- Adrian Vondendriesch <adrian.vondendriesch at credativ.de>  Fri, 03 Jul 2015 08:41:42 +0200
 
diff --git a/debian/fence-agents.install b/debian/fence-agents.install
index 91d2f61..4b96761 100644
--- a/debian/fence-agents.install
+++ b/debian/fence-agents.install
@@ -1,6 +1,7 @@
+usr/lib/fence-agents/fence_kdump_send
 usr/sbin/fence*
 usr/share/cluster/fence*
+usr/share/cluster/relaxng*
+usr/share/doc
 usr/share/fence*
 usr/share/man/man8/fence*
-usr/share/cluster/relaxng*
-usr/lib/fence-agents/fence_kdump_send 
diff --git a/debian/patches/fix-virsh-man-page-unexpected-special-character b/debian/patches/fix-virsh-man-page-unexpected-special-character
new file mode 100644
index 0000000..b89497c
--- /dev/null
+++ b/debian/patches/fix-virsh-man-page-unexpected-special-character
@@ -0,0 +1,17 @@
+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))
+ 
diff --git a/debian/patches/series b/debian/patches/series
index cfc3eb4..2c9d697 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 reproducible
+fix-virsh-man-page-unexpected-special-character
diff --git a/debian/rules b/debian/rules
index 5588cc0..959cd03 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ get-orig-source:
 	uscan --noconf --force-download --rename --repack --download-current-version --destdir=.
 
 %:
-	dh $@ --with python2 --with autoreconf
+	dh $@ --with python2 --with autoreconf --fail-missing
 
 override_dh_autoreconf:
 	dh_autoreconf ./autogen.sh
@@ -22,7 +22,9 @@ override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 override_dh_install:
-	dh_install --list-missing
+	rm -v debian/tmp/usr/share/doc/fence-agents/COPYING.applications
+	rm -v debian/tmp/usr/share/doc/fence-agents/COPYING.libraries
+	dh_install
 	# test agents (skip ack_manual, it doesn't have --help, skip vmware_helper, it wants VIRuntime.pm)
 	# we test in tmp after install so the .pyc files generated don't make it into the package
 	for agent in debian/tmp/usr/sbin/*; do \

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