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

[Markus Frosch]

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

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

commit 8f8bea6ba5d55a06d91f00b508e5fa7f6a862221
Merge: f6ac109 d17f5af
Author: Markus Frosch <lazyfrosch at debian.org>
Date:   Mon Aug 8 15:02:14 2016 +0200

    Merge branch 'master' into ubuntu_precise

 ChangeLog                                          |  2 +-
 VERSION                                            |  2 +-
 application/VERSION                                |  2 +-
 debian/changelog                                   | 28 +++++++++++++++
 debian/control                                     |  9 +++--
 debian/icingacli.install                           |  1 +
 debian/icingaweb2-common.install                   |  3 ++
 debian/icingaweb2-common.postinst                  |  6 +++-
 debian/icingaweb2.install                          |  1 -
 debian/rules                                       | 14 ++------
 debian/uglify/.gitignore                           |  3 ++
 debian/uglify/Makefile                             | 41 ++++++++++++++++++++++
 icingaweb2.spec                                    |  2 +-
 library/Icinga/Application/Version.php             |  2 +-
 modules/doc/module.info                            |  2 +-
 .../Command/Transport/RemoteCommandFile.php        | 24 ++-----------
 modules/monitoring/module.info                     |  2 +-
 modules/setup/module.info                          |  2 +-
 modules/test/module.info                           |  2 +-
 modules/translation/module.info                    |  2 +-
 20 files changed, 102 insertions(+), 48 deletions(-)

diff --cc debian/control
index bd223d5,345ea3e..7dac738
--- a/debian/control
+++ b/debian/control
@@@ -6,9 -6,9 +6,9 @@@ Uploaders
   Markus Frosch <lazyfrosch at debian.org>
  Build-Depends:
   debhelper (>= 9),
 - php-cli,
 + php5-cli,
   php-htmlpurifier (>= 4.3),
-  yui-compressor
+  node-uglify | yui-compressor, node-source-map | yui-compressor
  Standards-Version: 3.9.8
  Homepage: https://www.icinga.org
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-nagios/pkg-icingaweb2.git
@@@ -26,9 -27,12 +26,12 @@@ Depends
   ${misc:Depends}
  Recommends:
   apache2 | httpd,
 - php,
 - php-cli,
 - php-ldap,
 + php5 (>= 5.3.2),
 + php5-cli (>= 5.3.2),
 + php5-ldap,
+  php-json,
 - php-intl,
++ php5-intl,
+  php-imagick,
   icingacli,
   icingaweb2-module-monitoring,
   icingaweb2-module-doc
@@@ -105,11 -109,11 +108,11 @@@ Depends
   php-icinga (= ${source:Version}),
   ${misc:Depends}
  Recommends:
 - php-cli
 + php5-cli (>= 5.3.2)
  Suggests:
   icingaweb2-module-monitoring
- Replaces: icingaweb2 (<< 2.1.2-2~)
- Breaks: icingaweb2 (<< 2.1.2-2~)
+ Replaces: icingaweb2 (<< 2.3.4-2~)
+ Breaks: icingaweb2 (<< 2.3.4-2~)
  Description: simple CLI tool for Icingaweb2 and its modules
   Icinga Web 2 is a very modular, fast and simple web interface for your Icinga
   monitoring environment.

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