Merge branch 'wheezy' into experimental.

Conflicts:
	debian/changelog

diff --cc debian/changelog
index ec81128d9941cf873c09be65b42a38da2cf45535,64267a659c04f07b3faed0c41757f9fa7ca85157..4eca43f225e73f4cec0d492ff0049a6eb5403f80
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,17 +1,31 @@@
- pnp4nagios (0.6.16-2) unstable; urgency=low
++pnp4nagios (0.6.16-3) UNRELEASED; urgency=low
 +
 +  * debian/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).
 +  * debian/control:
 +    - Optionally depend on php5-cgi instead of libapache2-mod-php5 to allow
 +      for easier installations when not using Apache; thanks to Matthias
 +      Wamser for reporting this (Closes: #671231).
 +
 + -- Sebastian Harl <tokkee@debian.org>  Tue, 24 Apr 2012 14:44:33 +0200
 +
+ pnp4nagios (0.6.16-2) unstable; urgency=low
+ 
+   * debian/control:
+     - 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).
+   * debian/patches/:
+     - adjust-template-path: Fixed the patch for empty templates.d and some
+       versions of glob() which in this case returns nothing 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).
+ 
+  -- Sebastian Harl <tokkee@debian.org>  Sat, 24 Nov 2012 15:34:54 +0100
+ 
  pnp4nagios (0.6.16-1) unstable; urgency=low
  
    * New upstream version.

diff --cc debian/control
index edfbf00a4f46e13e56c2264f881502604115c15a,a7f82f8c2d8282744ef13414de4fd97e62d0cf4a..aa2cbd035c6d55284626155ef5214b6affdb05f7
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -42,10 -42,10 +42,10 @@@ Description: Nagios addon to create gra
  
  Package: pnp4nagios-web
  Architecture: all
 -Depends: libapache2-mod-php5 | php5, php5-gd,
 +Depends: libapache2-mod-php5 | php5-cgi | php5, php5-gd,
   libkohana2-php,
   libfpdi-php,
-  libjs-jquery (>= 1.6.2), libjs-jquery-ui (>= 1.8.14),
+  libjs-jquery (>= 1.6.2), libjs-jquery-ui (>= 1.8.ooops.14),
   rrdtool,
   adduser,
   ${misc:Depends}