[Pkg-nagios-changes] [SCM] debian packaging of PNP4Nagios branch, master, updated. v_0_6_13-1

[Sebastian Harl]

The following commit has been merged in the master branch:
commit b63bc70d523da1fa50ce61f198b527def911cc43
Author: Sebastian Harl <sh at tokkee.org>
Date:   Wed Jun 22 11:37:10 2011 +0200

    patches: Removed manpage-hyphen -- applied upstream.

diff --git a/debian/changelog b/debian/changelog
index b19668e..17c02d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 pnp4nagios (0.6.13-1) unstable; urgency=low
 
   * New upstream release.
+  * debian/patches/:
+    - Removed manpage-hyphen -- applied upstream.
 
- -- Sebastian Harl <tokkee at debian.org>  Wed, 22 Jun 2011 11:35:44 +0200
+ -- Sebastian Harl <tokkee at debian.org>  Wed, 22 Jun 2011 11:36:45 +0200
 
 pnp4nagios (0.6.12-1) unstable; urgency=low
 
diff --git a/debian/patches/manpage-hyphen b/debian/patches/manpage-hyphen
deleted file mode 100644
index 7f23f89..0000000
--- a/debian/patches/manpage-hyphen
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Do not use hyphens as minus sign in npcd.8.
-Author: Sebastian Harl <tokkee at debian.org>
-Forwarded: yes
-
---- a/man/npcd.8.in
-+++ b/man/npcd.8.in
-@@ -7,7 +7,7 @@
- .SH NAME
- npcd \- Nagios Performance C Daemon
- .SH SYNOPSIS
--\fBnpcd\fR [ \fB-d | --daemon\fR ] ( \fB-f | --config\fR ) \fI<configfile>
-+\fBnpcd\fR [ \fB\-d | \--daemon\fR ] ( \fB\-f | \--config\fR ) \fI<configfile>
- .SH DESCRIPTION
- The \fBnpcd\fR is a daemon processing nagios performance data.
- .PP
diff --git a/debian/patches/series b/debian/patches/series
index 85595ca..78f6972 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ apache-fix-path-to-userfile
 fix-npcd-path
 fix-nagios-url
 adjust-template-path
-manpage-hyphen

-- 
debian packaging of PNP4Nagios