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

[Sebastian Harl]

The following commit has been merged in the master branch:
commit e04524285dd02552532935ba4ed5dce2ef65bdca
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Jan 31 14:01:11 2012 +0100

    README.templates.d: Added README file for the use of /e/pnp4nagios/templates.d.
    
    The file will be installed to that directory.

diff --git a/debian/README.templates.d b/debian/README.templates.d
new file mode 100644
index 0000000..944257f
--- /dev/null
+++ b/debian/README.templates.d
@@ -0,0 +1,7 @@
+#
+# As of Debian version 0.6.16-1, the default config.php adds all directories
+# inside /etc/pnp4nagios/templates.d/ to the templates_dirs configuration.
+# This allows third-party packages to provide their own set of PNP4Nagios
+# templates and create a symlink to the template directory inside
+# /etc/pnp4nagios/templates.d.
+#
diff --git a/debian/changelog b/debian/changelog
index 9e739eb..c5f5d0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,8 +28,11 @@ pnp4nagios (0.6.16-1) unstable; urgency=low
       reporting this (Closes: #646587).
   * debian/patches/adjust-template-path:
     - Added support for /etc/pnp4nagios/templates.d.
+  * debian/README.templates.d:
+    - Added README file for the use of /etc/pnp4nagios/templates.d. The file
+      will be installed to that directory.
 
- -- Sebastian Harl <tokkee at debian.org>  Tue, 31 Jan 2012 13:53:51 +0100
+ -- Sebastian Harl <tokkee at debian.org>  Tue, 31 Jan 2012 14:00:47 +0100
 
 pnp4nagios (0.6.13-1) unstable; urgency=low
 
diff --git a/debian/pnp4nagios-web.install b/debian/pnp4nagios-web.install
index 84b5156..0bbade8 100644
--- a/debian/pnp4nagios-web.install
+++ b/debian/pnp4nagios-web.install
@@ -1,6 +1,7 @@
 etc/pnp4nagios/apache.conf
 etc/pnp4nagios/background.pdf
 etc/pnp4nagios/templates/
+etc/pnp4nagios/templates.d/
 etc/pnp4nagios/pages/
 etc/pnp4nagios/templates.special/
 etc/pnp4nagios/pnp4nagios_release
diff --git a/debian/rules b/debian/rules
index 48dac71..b9e40d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -155,6 +155,9 @@ install: build
 	rmdir debian/tmp/usr/share/pnp4nagios/html/application/hooks/
 	#rmdir debian/tmp/usr/share/pnp4nagios/html/application/libraries/
 
+	mkdir debian/tmp/etc/pnp4nagios/templates.d
+	cp debian/README.templates.d debian/tmp/etc/pnp4nagios/templates.d/README
+
 	dh_install --sourcedir=debian/tmp --fail-missing
 
 # Build architecture-independent files here.

-- 
debian packaging of PNP4Nagios