patches/: Removed raise-process-perfdata-timeout.

[pkg-pnp4nagios.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 2f3282b4f0070cbbc84906af2d28bfc8128f66be..fb6e8ace5dd935c5713d1a546db3955daf9555c3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+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.
+
+ -- Sebastian Harl <tokkee@debian.org>  Tue, 26 Apr 2011 13:07:42 +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) unstable; urgency=low
 
   [ Sven Velt ]
@@ -8,12 +32,25 @@ pnp4nagios (0.6.11-1) unstable; urgency=low
     libkohana2-php.
   * Ship all configuration in /etc and create appropriate symlinks.
   * Ship upstream sample configs as default configs.
+  * debian/patches:
+    - Added adjust-template-path: install templates into /etc/ rather than
+      /usr/share/.
+    - Added apache-fix-path-to-userfile: fix config directory in the sample
+      httpd.conf.
+    - Added fix-nagios-url: fix cgi-bin path in config.php.
+    - Added fix-npcd-path: fix perfdata paths in npcd.cfg.
+    - Added fix-path-fpdi: FPDI is shipped in its own subdirectory -- adopt
+      path in pdf.php.
+    - Added raise-process-perfdata-timeout: set timeout to 10s in
+      process_perfdata.cfg; in large and/or virtualized setups, 5s might not
+      be enough.
 
   [ Sebastian Harl ]
   * Build the following binary packages:
     - pnp4nagios-bin: NPCD and process_perfdata.pl
     - pnp4nagios-web: web interface
     - pnp4nagios: metapackage depending on the other two
-  * debian/watch: mange upstream version to replace ".rc" with "~rc".
+  * debian/watch: mangle upstream version to replace ".rc" with "~rc".
+  * Make Apache2 configuration optional using debconf.
 
- -- Sebastian Harl <tokkee@debian.org>  Wed, 09 Feb 2011 17:22:47 +0100
+ -- Sebastian Harl <tokkee@debian.org>  Mon, 14 Feb 2011 13:15:46 +0100