Merge lp:~xnox/ubuntu/quantal/nagios-nrpe/merge into lp:ubuntu/quantal/nagios-nrpe

[Dimitri John Ledkov]

 nagios-nrpe (2.12-6ubuntu1) quantal; urgency=low
 .
   * Merge with Debian; remaining changes:
     - debian/{rules,control}: add hardening-includes to gain PIE
       security builds.
     - Use dpkg-buildflags.
   * Changes gained from Debian:
     - [4dc53fb] Use retry argument for start-stop-daemon when stopping nrpe
     (LP: #896388)

=== added file 'debian/TODO'
--- debian/TODO	1970-01-01 00:00:00 +0000
+++ debian/TODO	2012-05-03 10:14:07 +0000
@@ -0,0 +1,5 @@
+TODO
+====
+
+
+Add a nagios-common package which ships a user and homedir
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-10-18 15:09:21 +0000
+++ debian/changelog	2012-05-03 10:14:07 +0000
@@ -1,3 +1,24 @@
+nagios-nrpe (2.12-6ubuntu1) quantal; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - debian/{rules,control}: add hardening-includes to gain PIE
+      security builds.
+    - Use dpkg-buildflags.
+  * Changes gained from Debian:
+    - [4dc53fb] Use retry argument for start-stop-daemon when stopping nrpe
+    (LP: #896388)
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Thu, 03 May 2012 10:59:22 +0100
+
+nagios-nrpe (2.12-6) unstable; urgency=low
+
+  * [36b1062] Add add icinga to the list of recommends
+  * [a698acb] Don't remove homedirectory of the nagios user (Closes: #665845)
+  * [4dc53fb] Use retry argument for start-stop-daemon when stopping nrpe
+    (Closes: #650464)
+
+ -- Alexander Wirt <[e-mail]>  Mon, 30 Apr 2012 09:25:45 +0200
+
 nagios-nrpe (2.12-5ubuntu1) precise; urgency=low
 
   * Merge with Debian; remaining changes:
 
=== modified file 'debian/control'
--- debian/control	2011-10-18 15:09:21 +0000
+++ debian/control	2012-05-03 10:14:07 +0000
@@ -26,7 +26,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: nagios-nrpe-doc
-Recommends: nagios3
+Recommends: nagios3 | icinga 
 Description: Nagios Remote Plugin Executor Plugin
  Nagios is a host/service/network monitoring and management system.
  .
 
=== modified file 'debian/nagios-nrpe-server.init'
--- debian/nagios-nrpe-server.init	2011-10-18 15:09:21 +0000
+++ debian/nagios-nrpe-server.init	2012-05-03 10:14:07 +0000
@@ -59,14 +59,12 @@
 	;;
   stop)
 	log_daemon_msg "Stopping $DESC" "$NAME"
-    start-stop-daemon --stop --quiet --oknodo --pidfile $PIDDIR/nrpe.pid
+	start-stop-daemon --stop --quiet --oknodo --pidfile $PIDDIR/nrpe.pid --retry 15
 	log_end_msg $?
-    #sometimes deleting the pidfile fails. cleanup afterwards.
-    test -e $PIDDIR/nrpe.pid && rm $PIDDIR/nrpe.pid
 	;;
   reload|force-reload)
 	log_daemon_msg "Reloading $DESC configuration files" "$NAME"
-    start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDDIR/nrpe.pid
+	start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDDIR/nrpe.pid
 	log_end_msg $?
 	;;
   status)
 
=== removed file 'debian/nagios-nrpe-server.postrm'
--- debian/nagios-nrpe-server.postrm	2009-07-06 07:08:26 +0000
+++ debian/nagios-nrpe-server.postrm	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ "$1" = purge ]; then
-	test -d /var/lib/nagios && rmdir /var/lib/nagios || true #ignore non-failure errors 
-fi
-
-#DEBHELPER#
-