[Pkg-nagios-changes] [pkg-icingaweb2] 01/01: Merge branch 'master' into legacy

[Markus Frosch]

This is an automated email from the git hooks/post-receive script.

lazyfrosch pushed a commit to branch legacy
in repository pkg-icingaweb2.

commit b39702fc051947abadaffa4913aa0b255325df17
Merge: 5d3bba3 6cb0061
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Wed Mar 11 10:08:13 2015 +0100

    Merge branch 'master' into legacy

 debian/control                                     | 42 ++++++----------------
 debian/icingacli.install                           |  3 --
 debian/icingaweb2-common.install                   |  1 -
 debian/icingaweb2-common.postinst                  | 40 ---------------------
 debian/{icingaweb2-common.dirs => icingaweb2.dirs} |  0
 debian/icingaweb2.install                          |  5 +++
 debian/icingaweb2.postinst                         | 21 +++++++++++
 7 files changed, 36 insertions(+), 76 deletions(-)

diff --cc debian/control
index 842f97c,07cfe49..c38ea1e
--- a/debian/control
+++ b/debian/control
@@@ -16,10 -16,10 +16,10 @@@ Package: icingaweb
  Architecture: all
  Depends:
   adduser,
-  icingaweb2-common,
+  php-icinga (= ${source:Version}),
  # 4.4 in wheezy - TODO: test
 - php-htmlpurifier (>= 4.4),
 - php-dompdf (>= 0.6.1),
 +# legacy: php-htmlpurifier (>= 4.4),
 +# legacy: php-dompdf (>= 0.6.1),
  # php-parsedown,
  # php-lessphp,
  # php-jshrink,
@@@ -105,9 -84,8 +84,8 @@@ Section: ph
  Architecture: all
  Depends:
   php5 (>= 5.3.2),
 - zendframework,
 +# legacy: zendframework,
   ${misc:Depends}
- # | icingaweb-vendor-zend
  Recommends:
   php5-mysql | php5-mysqlnd | php5-pgsql,
   php5-json

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icingaweb2.git