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

[Markus Frosch]

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

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

commit 4c95df2cea6cf15ee4beb6a190da5846430d07cc
Merge: 3196499 980fb89
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Mon Feb 22 13:20:09 2016 +0100

    Merge branch 'master' into ubuntu

 debian/changelog                                   | 12 +++++
 debian/control                                     | 60 +++++++++++++++++-----
 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(+), 77 deletions(-)

diff --cc debian/changelog
index 1138efb,7f04253..d1cb673
--- 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-2~ppa1) precise; urgency=medium
 +
 +  * Rebuild for my launchpad ppa
 +
 + -- Alexander Wirt <formorer at debian.org>  Wed, 18 Nov 2015 13:35:24 +0100
 +
  icingaweb2 (2.1.2-1) unstable; urgency=medium
  
    * [92126c1] Imported Upstream version 2.1.1
diff --cc debian/control
index 8936342,65e96ef..f9b223b
--- a/debian/control
+++ b/debian/control
@@@ -15,11 -17,9 +17,10 @@@ Vcs-Git: https://anonscm.debian.org/git
  Package: icingaweb2
  Architecture: all
  Depends:
-  adduser,
-  php-icinga (= ${source:Version}),
+  icingaweb2-common (= ${source:Version}),
 - php-htmlpurifier (>= 4.3),
 - php-dompdf (>= 0.6.1),
 +# 4.4 in wheezy - TODO: test
- # php-htmlpurifier (>= 4.4),
++# php-htmlpurifier (>= 4.3),
 +# php-dompdf (>= 0.6.1),
  # php-parsedown,
  # php-lessphp,
  # php-jshrink,
diff --cc debian/icingaweb2.install
index eacec18,bf7e7be..7c2d772
--- a/debian/icingaweb2.install
+++ b/debian/icingaweb2.install
@@@ -21,9 -17,5 +17,8 @@@ debian/icingaweb2.conf           etc/ap
  library/vendor/JShrink/*.php     usr/share/icingaweb2/library/vendor/JShrink
  library/vendor/Parsedown/*.php   usr/share/icingaweb2/library/vendor/Parsedown
  library/vendor/lessphp/*.php     usr/share/icingaweb2/library/vendor/lessphp
 +library/vendor/dompdf/{*.php,lib,include} usr/share/icingaweb2/library/vendor/dompdf
 +library/vendor/HTMLPurifier/{*.php,*/} usr/share/icingaweb2/library/vendor/HTMLPurifier
 +library/vendor/Zend/{*.php,*/} usr/share/icingaweb2/library/vendor/Zend
  
- modules/setup  usr/share/icingaweb2/modules
- modules/iframe usr/share/icingaweb2/modules
+ modules/iframe                   usr/share/icingaweb2/modules

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