Merge commit 'v_0_6_12-1' into lenny-backports

diff --cc debian/changelog
index 60804f6929b3043a211d6a3811a64b2e74252592,90e8d5b44ab3334a1e9cc09e39fc5ee6ecb598eb..c1675e3a2ccd000c5312737809c27ed7ca2a415c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,44 +1,50 @@@
+ pnp4nagios (0.6.12-1) unstable; urgency=low
+ 
+   * New upstream release.
+   * debian/patches/:
+     - Removed raise-process-perfdata-timeout -- a similar patch has been
+       included upstream.
+     - Added manpage-hyphen -- do not use hyphens as minus sign in npcd.8.
+   * debian/rules:
+     - npcd.cfg and process_perfdata.cfg are not longer installed as sample
+       configs by the upstream Makefile; so, don't rename those files.
+     - Do not pass --prefix to configure and set man-/infodir correctly. The
+       prefix is set by layout=debian and cannot be overwritten, thus do not
+       pretend this is possible. Also, do not use $prefix when setting man-/
+       infodir but specify the complete path.
+     - Do not install config_local.php and config.php.$PKG_VERSION.
+     - Remove generated scripts/rc.pnp_gearman_worker in 'clean'.
+   * debian/rules, debian/pnp4nagios-bin.install:
+     - Do not install npcd.8 using dh_installman; this is done by the upstream
+       Makefile now.
+   * debian/pnp4nagios-bin.pnp_gearman_worker.default,
+     pnp4nagios-bin.pnp_gearman_worker.init:
+     - Added init script for the PNP4Nagios Gearman worker daemon.
+     - The daemon is disabled by default.
+ 
+  -- Sebastian Harl <tokkee@debian.org>  Wed, 27 Apr 2011 09:05:48 +0200
+ 
+ pnp4nagios (0.6.11-2) unstable; urgency=low
+ 
+   * debian/po/:
+     - Added French debconf translation; thanks to Christian Perrier for
+       providing the translation (Closes: #623181).
+     - Added German debconf translation.
+     - Added Russian debconf translation; thanks to Yuri Kozlov for providing
+       the translation (Closes: #623798).
+   * debian/pnp4nagios-web.postinst:
+     - Do not set permissions of /var/log/pnp4nagios/stats -- this is done in
+       pnp4nagios-bin.postinst which ships the directory. This fixes an error
+       when installing -web without -bin.
+ 
+  -- Sebastian Harl <tokkee@debian.org>  Tue, 26 Apr 2011 11:48:54 +0200
+ 
 +pnp4nagios (0.6.11-1~bpo50+1) lenny-backports-sloppy; urgency=low
 +
 +  * Rebuild for lenny-backports-sloppy.
 +
 + -- Sebastian Harl <tokkee@debian.org>  Fri, 29 Apr 2011 08:37:54 +0200
 +
  pnp4nagios (0.6.11-1) unstable; urgency=low
  
    [ Sven Velt ]