X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=debian%2Fchangelog;h=5b5b3142bc2fdefeea137f92e49deb182c539338;hb=9a6874e8d22227c53fcff1a59297e6c1f7cc5b63;hp=fe18ccf980f94d471af765b47bd426d4d8d96d71;hpb=d1583e7635f3116845c3410cd1eb6b42023e3925;p=pkg-pnp4nagios.git

diff --git a/debian/changelog b/debian/changelog
index fe18ccf..5b5b314 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,31 +1,41 @@
-pnp4nagios (0.6.11-2) unstable; urgency=low
+pnp4nagios (0.6.11-2) UNRELEASED; urgency=low
 
-  * Use "php-fpdf", "php-fpdf-tpl" and "php-fpdi" packages instead of bundled
-    copies
+  * debian/po/:
+    - Added French debconf translation; thanks to Christian Perrier for
+      providing the translation (Closes: #623181).
+    - Added German debconf translation.
 
- -- Sven Velt <sven@velt.de>  Fri, 21 Jan 2011 11:37:32 +0100
+ -- Sebastian Harl <tokkee@debian.org>  Mon, 18 Apr 2011 10:29:38 +0200
 
 pnp4nagios (0.6.11-1) unstable; urgency=low
 
-  * New upstream release
-
- -- Sven Velt <sven@velt.de>  Thu, 20 Jan 2011 12:17:19 +0100
-
-pnp4nagios (0.6.10-1) UNRELEASED; urgency=low
-
-  * New upstream release
-
- -- Sven Velt <sven@velt.de>  Wed, 22 Dec 2010 10:04:32 +0000
-
-pnp4nagios (0.6.7-1) UNRELEASED; urgency=low
-
-  * New upstream release
-
- -- Sven Velt <sven@velt.de>  Tue, 14 Dec 2010 14:57:23 +0000
-
-pnp4nagios (0.6.3-1) unstable; urgency=low
-
+  [ Sven Velt ]
   * Initial release (Closes: #479031)
-
- -- Sven Velt <sven@velt.de>  Fri, 27 Nov 2009 21:08:18 +0100
-
+  * Use "php-fpdf", "php-fpdf-tpl" and "php-fpdi" packages instead of bundled
+    copies.
+  * Do not use the bundled copy of Kohana2 but rather depend on
+    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: mangle upstream version to replace ".rc" with "~rc".
+  * Make Apache2 configuration optional using debconf.
+
+ -- Sebastian Harl <tokkee@debian.org>  Mon, 14 Feb 2011 13:15:46 +0100