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

[Markus Frosch]

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

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

commit ea48c4547c53117755c2d1250280c685fb08fa44
Merge: ba5725b 980fb89
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Mon Feb 22 13:13:52 2016 +0100

    Merge branch 'master' into debmon-wheezy

 debian/changelog                                   | 12 +++++
 debian/control                                     | 61 +++++++++++++++++-----
 debian/icingacli.install                           |  3 ++
 debian/{icingaweb2.dirs => icingaweb2-common.dirs} |  0
 debian/icingaweb2-common.install                   |  6 +++
 debian/icingaweb2-common.postinst                  | 40 ++++++++++++++
 debian/icingaweb2-common.postrm                    | 11 ++++
 debian/icingaweb2.install                          |  7 +--
 debian/icingaweb2.postinst                         | 25 ---------
 debian/icingaweb2.postrm                           |  6 ---
 debian/patches/10_html_purifier                    | 26 ---------
 debian/patches/series                              |  1 -
 debian/rules                                       |  5 ++
 debian/test/php-htmlpurifier.php                   | 16 ++++++
 14 files changed, 141 insertions(+), 78 deletions(-)

diff --cc debian/changelog
index b663f42,7f04253..aae1ad1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,21 @@@
+ icingaweb2 (2.1.2-2) unstable; urgency=medium
+ 
+   * [672fcae] Split out icingacli and icingaweb2-common as packages
+   * [5927c7e] Include translation module
+   * [71eca67] Remove 10_html_purifier patch
+   * [a0ef32a] Test php-htmlpurifier loading, allow from version 4.3
+   * [a029ff6] Update VCS URLs
+   * [4de17c5] Remove duplicate adduser in postinst
+   * [0f4f2ac] Bump standards version to 3.9.7
+ 
+  -- Markus Frosch <lazyfrosch at debian.org>  Mon, 22 Feb 2016 13:02:00 +0100
+ 
 +icingaweb2 (2.1.2-1~debmon70+1) debmon-wheezy; urgency=medium
 +
 +  * Rebuild for debmon-wheezy
 +
 + -- Markus Frosch <lazyfrosch at debian.org>  Wed, 23 Dec 2015 15:29:04 +0100
 +
  icingaweb2 (2.1.2-1) unstable; urgency=medium
  
    * [92126c1] Imported Upstream version 2.1.1

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