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

[Markus Frosch]

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

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

commit d3835961c35d250aa0cc376a0f070ca5b42f612e
Merge: 318eac1 5170ce4
Author: Markus Frosch <lazyfrosch at debian.org>
Date:   Mon Aug 8 14:23:08 2016 +0200

    Merge branch 'master' into debmon-jessie

 ChangeLog                              |  2 +-
 VERSION                                |  2 +-
 application/VERSION                    |  2 +-
 debian/changelog                       | 13 +++++++++++
 debian/control                         |  6 ++---
 debian/icingaweb2-common.install       |  3 +++
 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 +-
 modules/monitoring/module.info         |  2 +-
 modules/setup/module.info              |  2 +-
 modules/test/module.info               |  2 +-
 modules/translation/module.info        |  2 +-
 16 files changed, 76 insertions(+), 24 deletions(-)

diff --cc debian/changelog
index 307714d,2150d31..890591f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,22 @@@
+ icingaweb2 (2.3.4+fix-1) unstable; urgency=medium
+ 
+   [ Alexander Wirt ]
+   * [7fa211e] Imported Upstream version 2.3.4
+ 
+   [ Markus Frosch ]
+   * [f2d0189] Fix merged base for 2.3.4
+   * [4c547d8] Include test module into distribution
+   * [a9493cd] Fix icingacli breaking dependency for bash-completion update
+   * [3f6ff8a] Add proper Javascript minification with uglifyjs
+ 
+  -- Markus Frosch <lazyfrosch at debian.org>  Mon, 08 Aug 2016 14:15:06 +0200
+ 
 +icingaweb2 (2.3.4-2~debmon8+1) debmon-jessie; urgency=medium
 +
 +  * Rebuild for debmon-jessie.
 +
 + -- Alexander Wirt <formorer at debian.org>  Sun, 17 Jul 2016 10:26:27 +0200
 +
  icingaweb2 (2.3.4-2) unstable; urgency=medium
  
    * [a7f069b] Re-add www-data to icingaweb2 group (Closes: #831530)
diff --cc debian/control
index 3e96ca5,345ea3e..7f43c63
--- 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
@@@ -105,11 -109,11 +105,11 @@@ Depends
   php-icinga (= ${source:Version}),
   ${misc:Depends}
  Recommends:
 - php-cli
 + php5-cli (>= 5.3.2)
  Suggests:
   icingaweb2-module-monitoring
- Replaces: icingaweb2 (<< 2.3.4-1~)
- Breaks: icingaweb2 (<< 2.3.4-1~)
+ 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