![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
Merge branch 'wheezy' into experimental.
Conflicts:
debian/changelog
Conflicts:
debian/changelog
Released the changelog for unstable.
patches/: adjust-template-path: Fixed the patch for empty templates.d.
Some versions of glob() return nothing in this case, resulting in PHP syntax
errors and a crash of PNP4Nagios.
Thanks to Christoph Anton Mitterer for reporting this and pointing out a fix!
Closes: #683138
Some versions of glob() return nothing in this case, resulting in PHP syntax
errors and a crash of PNP4Nagios.
Thanks to Christoph Anton Mitterer for reporting this and pointing out a fix!
Closes: #683138
control: Fixed versioned build-dep on libjs-jquery-ui.
Adapted versioned build-dep on libjs-jquery-ui to the workaround used by that
package (1.8.14 -> 1.8.ooops.14).
Thanks to Christoph Anton Mitterer for reporting this.
Closes: #683100
Adapted versioned build-dep on libjs-jquery-ui to the workaround used by that
package (1.8.14 -> 1.8.ooops.14).
Thanks to Christoph Anton Mitterer for reporting this.
Closes: #683100
control: Optionally depend on php5-cgi instead of libapache2-mod-php5.
This allows for easier installations when not using Apache; thanks to Matthias
Wamser for reporting this.
Closes: #671231
This allows for easier installations when not using Apache; thanks to Matthias
Wamser for reporting this.
Closes: #671231
pnp4nagios.postrm: Fixed typo: Apache's config files use file suffix .conf.
… rather than .cfg; this prevented /etc/apache2/conf.d/pnp4nagios.conf from
being removed on remove/purge; thanks to Andreas Beckmann for reporting this.
cf. #669839
… rather than .cfg; this prevented /etc/apache2/conf.d/pnp4nagios.conf from
being removed on remove/purge; thanks to Andreas Beckmann for reporting this.
cf. #669839
README.Debian: Fixed typo.
D'oh! ;-)
Thanks to Tolimar for pointing this out!
D'oh! ;-)
Thanks to Tolimar for pointing this out!
po/es.po: Updated by debconf-updatepo.
README.templates.d: Added README file for the use of /e/pnp4nagios/templates.d.
The file will be installed to that directory.
The file will be installed to that directory.
patches/adjust-template-path: Added support for /etc/pnp4nagios/templates.d.
README.Debian: Added a note about installation with Icinga.
… referring to the different htpasswd.users file location; thanks to Alexander
Reichle-Schmehl for reporting this.
Closes: #646587
… referring to the different htpasswd.users file location; thanks to Alexander
Reichle-Schmehl for reporting this.
Closes: #646587
po/: Added Czech debconf translations.
Thanks to Michal Šimůnek for providing those.
Closes: #655132
Thanks to Michal Šimůnek for providing those.
Closes: #655132
po/: Added Danish debconf translations.
Thanks to Joe Dalton for providing those (Closes: #654816).
Thanks to Joe Dalton for providing those (Closes: #654816).
po/: Added Dutch debconf translations.
Thanks to Jeroen Schot for providing those.
Closes: #654214
Thanks to Jeroen Schot for providing those.
Closes: #654214
po/: Added Portuguese debconf translations.
Thanks to Pedro Ribeiro for providing those.
Closes: #651432
Thanks to Pedro Ribeiro for providing those.
Closes: #651432
po/: Added Spanish debconf translations.
Thanks to Camaleón for providing those.
Closes: #632953
Thanks to Camaleón for providing those.
Closes: #632953
pnp4nagios-web.postinst: Don't call a2mod / restart apache2 unconditionally.
… rather, only if the binaries are available.
Thanks to Wouter Schoot for reporting this.
Closes: #636218
… rather, only if the binaries are available.
Thanks to Wouter Schoot for reporting this.
Closes: #636218
pnp4nagios-bin.install: Install verify_pnp_config_v2.pl.
… to /u/l/pnp4nagios/libexec/.
… to /u/l/pnp4nagios/libexec/.
copyright: Added missing GPL-2 and GPL-3+ license information.
copyright: Fixed DEP5 syntax errors.
rules: Added recommended targets build-{arch,indep} depending on build-stamp.
patches/adjust-template-path: Updated.
copyright: Updated for 0.6.16.
control: Depend on jQuery >= 1.6.2 and jQuery-ui >= 1.8.14.
… rather than unversioned dependencies. This is what upstream did as well.
… rather than unversioned dependencies. This is what upstream did as well.
changelog: Updated to 0.6.16-1.
changelog: Documented changes in README.Debian.
control: Updated standards-version to 3.9.2 -- no changes.
po: Added Swedish debconf translation.
Thanks to Martin Bagge for providing the translation.
Closes: #628926
Thanks to Martin Bagge for providing the translation.
Closes: #628926
po: Added Japanese debconf translation
Thanks to Hideki Yamane for providing the translation.
Closes: #626386
Thanks to Hideki Yamane for providing the translation.
Closes: #626386
rules: Don't remove scripts/rc.pnp_gearman_worker in 'clean'.
This is now taken care of in the upstream Makefile.
This is now taken care of in the upstream Makefile.
patches: Removed manpage-hyphen -- applied upstream.
changelog: Updated to 0.6.13-1.
README.Debian: Be a bit more verbose about how to setup Gearman mode.
README.Debian: Added a note about Perl modules required in Gearman mode.
README.Debian, control: Added some notes about Gearman mode.
-bin.pnp_gearman_worker.{default,init}: Init script for Gearman worker.
The daemon is disabled by default.
The daemon is disabled by default.
rules: Remove generated scripts/rc.pnp_gearman_worker in 'clean'.
patches/: Added manpage-hyphen -- do not use hyphens as minus sign in npcd.8.
rules: Do not install config_local.php and config.php.$PKG_VERSION.
rules, pnp4nagios-bin.install: Do not install npcd.8 using dh_installman.
This is done by the upstream Makefile now.
This is done by the upstream Makefile now.
Updated changelog.
rules: 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.
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.
rules: npcd.cfg and process_perfdata.cfg are no longer installed as samples.
Thus, no need to rename the sample to the real config file.
Thus, no need to rename the sample to the real config file.
copyright: Updated for version 0.6.12.
patches/: Removed raise-process-perfdata-timeout.
A similar patch has been included upstream.
A similar patch has been included upstream.
changelog: Updated to 0.6.12-1.
changelog: Fixed typo.
changelog: Set distribution to 'unstable'.
changelog: Be a bit more verbose.
copyright: Added po/ru.po.
po/: Added Russian debconf translation.
Thanks to Yuri Kozlov for providing the translation.
Closes: #623798
Thanks to Yuri Kozlov for providing the translation.
Closes: #623798
pnp4nagios-web.postinst: Do not set permissions of /var/log/pnp4nagios/stats.
This is done in pnp4nagios-bin.postinst which ships the directory.
This is done in pnp4nagios-bin.postinst which ships the directory.
debian/po/: Added German debconf translation.
debian/po/: Added French debconf translation.
Thanks to Christian Perrier for providing the translation.
Closes: #623181
Thanks to Christian Perrier for providing the translation.
Closes: #623181
changelog: Updated timestamp ;-)
pnp4nagios-bin.npcd.default: Disable NPCD by default.
Using NPCD is optional, so it should not be enabled by default. Also, users
might want to modify the configuration before having the daemon started.
Updated README.Debian to reflect this change.
Using NPCD is optional, so it should not be enabled by default. Also, users
might want to modify the configuration before having the daemon started.
Updated README.Debian to reflect this change.
pnp4nagios-bin.npcd.init: Removed whitespace before ':' when starting npcd.
changelog: Fixed typo.
control: Set maintainer to Debian Nagios Maintainer Group.
control: Added Vcs-* fields.
rules: Do not call dh_installinit for "-a -Npnp4nagios-bin".
Lenny's debhelper does not cope with that since no package is left.
Lenny's debhelper does not cope with that since no package is left.
Make Apache2 configuration optional using debconf.
Also, use po-debconf for internationalization support.
Also, use po-debconf for internationalization support.
rules: Fixed the Kohana2 system path.
control: Let -web depend on libkohana2-php.
… rather than libkohana-php.
… rather than libkohana-php.
rules: Fixed path to README.Debian.
Install NPCD init/default scripts with --name=npcd rather than pnp4nagios-bin.
rules: Install README.Debian as well.
rules: Pass --with-httpd-conf=/etc/apache2/conf.d to configure.
Else, it'll fall back to /etc/httpd/conf.d if Apache is not installed at build
time.
Else, it'll fall back to /etc/httpd/conf.d if Apache is not installed at build
time.
control: Build-depend on autotools-dev.
changelog: Mention and describe all patches.
changelog: Be more verbose ;-)
Remove *.in from examples/ssi
Cleaned up pnp4nagios-bin.init.
Updated copyright.
patches/raise-process-perfdata-timeout: More verbose description.
Cleaned up and documented patches.
rules: Install man/npcd.8.
Split package into "pnp4nagios-bin" and "pnp4nagios-web".
In theory, this allows to run the two parts on different hosts. Also, this
way, the rather large /usr/share is shipped in an arch=all package.
In theory, this allows to run the two parts on different hosts. Also, this
way, the rather large /usr/share is shipped in an arch=all package.
copyright: Updated and completed.
changelog: Merged all entries.
Imho, there is no benefit from having multiple "new upstream release" entries
that have never been used anywhere.
Imho, there is no benefit from having multiple "new upstream release" entries
that have never been used anywhere.
watch: Mangle ".rc" to "~rc" in the upstream version.
watch: Use the SF redirector.
control: Updated to standards-version 3.9.1.
source/format: Document the use of source format 1.0.
rules: Cleaned up a bit.
README.Debian: Removed whitespace at end of line.
postinst: Create the nagios user with the same settings as in nagios3-common.
pnp4nagios.default: Some minor cleanup.
control: Improved description.
control: "Updated" homepage.
control: Split "Depends:" into multiple lines.
Added myself to uploaders.
control: Changed priority from extra to optional.
Added README.source.
… with a pointer to /u/s/doc/quilt/README.source.
… with a pointer to /u/s/doc/quilt/README.source.
control: Build-depend on quilt.
rules: Added "get-orig-source" target.
rules: Added x-bit.
Added watch file.
Remove not needed symlink
Use libjs-jquery and libjs-jquery-ui instead of bundled ones