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

[Markus Frosch (old DM Account)]

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

lazyfrosch-guest pushed a commit to branch debmon-wheezy
in repository pkg-icinga-web.

commit a008dbcbfba79ff8d2487f084ab354fe589d9ede
Merge: bfe2cc4 7981018
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Tue Sep 9 15:02:45 2014 +0200

    Merge branch 'master' into debmon-wheezy
    
    Conflicts:
    	debian/changelog

 .gitignore                                         |   4 +-
 debian/{icinga-web.NEWS => NEWS}                   |  17 +++
 debian/access.local.xml.tmpl                       |  17 +++
 debian/changelog                                   |  14 ++
 debian/control                                     |  94 +++++++++++++-
 debian/copyright                                   |  26 ++--
 debian/cronks.xml                                  | 107 ----------------
 debian/databases.xml                               |  69 ----------
 debian/icinga-web-config-icinga.README.Debian      |  11 ++
 debian/icinga-web-config-icinga.postinst           |  99 +++++++++++++++
 debian/icinga-web-config-icinga.postrm             |  13 ++
 ...inga-web-config-icinga2-ido-mysql.README.Debian |  11 ++
 .../icinga-web-config-icinga2-ido-mysql.postinst   | 141 +++++++++++++++++++++
 debian/icinga-web-config-icinga2-ido-mysql.postrm  |  15 +++
 ...inga-web-config-icinga2-ido-pgsql.README.Debian |  11 ++
 .../icinga-web-config-icinga2-ido-pgsql.postinst   | 141 +++++++++++++++++++++
 debian/icinga-web-config-icinga2-ido-pgsql.postrm  |  15 +++
 debian/icinga-web.README.Debian                    | 139 ++++++++++----------
 debian/icinga-web.install                          |   6 +-
 debian/icinga-web.lintian-overrides                |   3 -
 debian/icinga-web.postinst                         |  23 ++--
 debian/icinga-web.postrm                           |   2 -
 debian/module_reporting.xml                        |  22 ----
 debian/patches/00_database_includes                |  31 +++++
 debian/patches/01_disable_reporting                |  34 +++++
 debian/patches/02_docs_urls                        |  43 +++++++
 debian/patches/03_access_include                   |  18 +++
 debian/patches/11_lintian_confusion                |  31 +++++
 debian/patches/series                              |   5 +
 29 files changed, 842 insertions(+), 320 deletions(-)

diff --cc debian/changelog
index e0725a6,e140db4..6fce664
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,17 +1,23 @@@
+ icinga-web (1.11.1-2) unstable; urgency=medium
+ 
+   * [8f41dce] Avoid confusion of Linitian with donation HTML code in comments
+   * [8e87a20] Split configuration of IDO connection to separate packages
+   * [a85f558] Add NEWS entry for config split
+   * [c6cff5a] Use proper patches for configuration changes
+   * [c96f5f5] Setup commandpipe for Icinga2
+   * [a7d577c] Update README.Debian
+   * [bc786a0] Update copyright
+   * [157f8c8] Remove generated configs on postrm remove
+   * [dc82307] Fix setperm in postinst
+ 
+  -- Markus Frosch <lazyfrosch at debian.org>  Tue, 09 Sep 2014 14:58:03 +0200
+ 
 +icinga-web (1.11.1-1~debmon70+1) debmon-wheezy; urgency=medium
 +
 +  * Rebuild for debmon-wheezy.
 +
 + -- Markus Frosch <lazyfrosch at debian.org>  Tue, 05 Aug 2014 17:36:40 +0200
 +
  icinga-web (1.11.1-1) unstable; urgency=medium
  
    * [9682a38] Imported Upstream version 1.11.1

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