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

[Alexander Wirt]

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

formorer pushed a commit to branch debmon-wheezy
in repository pkg-icingaweb2.

commit 5cbbcf787dc1c19d71c8668c3ef8341848511a19
Merge: 73f9333 f084559
Author: Alexander Wirt <formorer at debian.org>
Date:   Sun Jul 17 10:18:12 2016 +0200

    Merge branch 'master' into debmon-wheezy

 application/VERSION                                |  2 +-
 debian/changelog                                   | 18 +++++++++++++++-
 debian/control                                     |  4 ++--
 debian/icingacli.install                           |  1 +
 debian/icingaweb2-common.postinst                  |  6 +++++-
 debian/icingaweb2.install                          |  1 -
 .../Command/Transport/RemoteCommandFile.php        | 24 ++--------------------
 7 files changed, 28 insertions(+), 28 deletions(-)

diff --cc debian/changelog
index 09e9bd4,1fe858e..6125386
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,18 +1,25 @@@
- icingaweb2 (2.3.3-1~debmon70+1) debmon-wheezy; urgency=medium
++icingaweb2 (2.3.4-2~debmon70+1) debmon-wheezy; urgency=medium
 +
 +  * Rebuild for debmon-wheezy.
 +
 + -- Markus Frosch <lazyfrosch at debian.org>  Fri, 10 Jun 2016 11:36:24 +0200
 +
+ icingaweb2 (2.3.4-2) unstable; urgency=medium
+ 
+   * [a7f069b] Re-add www-data to icingaweb2 group (Closes: #831530)
+   * [3c63052] Recommend some optional modules (Closes: #831440)
+   * [cc5c7b5] Move bash completion to icingacli package (Closes: #830938)
+   * [5a3d014] Fix group and permissions of modules directory
+ 
+  -- Alexander Wirt <formorer at debian.org>  Sun, 17 Jul 2016 10:13:36 +0200
+ 
+ icingaweb2 (2.3.4-1) unstable; urgency=medium
+ 
+   * Imported Upstream version 2.3.4
+ 
+  -- Alexander Wirt <formorer at debian.org>  Mon, 20 Jun 2016 19:57:23 +0200
++>>>>>>> master
+ 
  icingaweb2 (2.3.3-1) unstable; urgency=medium
  
    * [6c8a309] Imported Upstream version 2.3.3
diff --cc debian/control
index 358afa4,58a3554..3e96ca5
--- a/debian/control
+++ b/debian/control
@@@ -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.1.2-2~)
- Breaks: icingaweb2 (<< 2.1.2-2~)
+ Replaces: icingaweb2 (<< 2.3.4-1~)
+ Breaks: icingaweb2 (<< 2.3.4-1~)
  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