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

[Markus Frosch]

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 fffa9b5249ed44cec2299092ad6af9cd1df8202c
Merge: f60c4c1 b5590df
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Wed Feb 19 18:21:20 2014 +0100

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

 Makefile.in                                        |  1 +
 app/modules/Api/actions/ApiCommandAction.class.php | 13 ++--
 app/modules/Api/config/views/host.xml              | 23 ++++---
 app/modules/Api/config/views/hostgroups.xml        |  4 +-
 app/modules/Api/config/views/overview.xml          | 12 ++++
 app/modules/Api/config/views/service.xml           |  6 +-
 app/modules/Api/config/views/servicegroups.xml     |  4 +-
 .../lib/console/IcingaConsoleCommandInterface.php  |  2 +-
 .../datastore/IcingaApiDataStoreModel.class.php    |  2 +-
 .../IcingaStoreTargetModifierModel.class.php       |  2 +-
 .../Api/models/Views/ApiDQLViewModel.class.php     |  3 +
 .../config/AppKitExtJSDataStoreWriter.class.php    |  2 +-
 app/modules/AppKit/lib/js/AppKitNavBar.js          |  2 +-
 .../AppKit/lib/js/icinga/grid/GridFactory.js       | 16 ++---
 .../AppKit/lib/js/icinga/store/StoreFactory.js     | 10 +--
 .../AppKit/models/Auth/DispatchModel.class.php     |  8 ++-
 .../models/Auth/Provider/AuthKeyModel.class.php    |  2 +-
 .../ModuleInstaller/ModuleValidatorModel.class.php |  2 +-
 app/modules/Cronks/config/javascript.xml           | 26 +++++---
 .../xml/grid/icinga-open-problems-template.xml     | 78 +++++++++++-----------
 .../Cronks/lib/js/Cronk/grid/CommandHandler.js     | 31 +++++----
 .../renderer/bc_customColumnPerfdataSanatized.js   | 11 +++
 .../Cronks/lib/js/Cronk/util/CronkOpener.js        |  4 +-
 app/modules/Cronks/lib/js/Cronk/util/CronkUtil.js  |  6 +-
 .../lib/js/Icinga/Cronks/System/PortalView.js      |  4 +-
 .../lib/js/Icinga/Cronks/util/FilterTypes/Base.js  |  8 +--
 .../Cronks/util/FilterTypes/FieldProvider.js       | 10 +--
 .../js/Icinga/Cronks/util/FilterTypes/Status.js    |  4 +-
 app/modules/Web/lib/js/SimpleDataProvider.js       |  2 +-
 app/modules/Web/lib/js/StatusData.js               |  2 +-
 configure                                          | 20 +++---
 debian/changelog                                   | 12 ++++
 debian/control                                     |  4 +-
 debian/icinga-web.lintian-overrides                |  2 +
 debian/rules                                       |  2 +
 debian/watch                                       |  4 +-
 doc/CHANGELOG-1.10                                 | 34 ++++++++++
 doc/README.RHEL                                    | 10 +--
 doc/README.SUSE                                    | 10 +--
 doc/VERSION                                        |  2 +-
 etc/apache2/icinga-web.conf.in                     |  4 ++
 etc/conf.d/module_appkit.xml                       |  8 ++-
 etc/make/version.m4                                |  4 +-
 etc/schema/mysql.sql                               |  4 +-
 etc/schema/oracle.sql                              |  4 +-
 etc/schema/pgsql.sql                               |  9 ++-
 etc/schema/sqlite.sql                              |  2 +-
 .../updates/mysql/mysql_v1-10-0_to_1-10-1.sql      |  7 ++
 .../updates/oracle/oracle_v1-10-0_to_v1-10-1.sql   | 13 ++++
 .../updates/pgsql/pgsql_v1-10-0_to_v1-10-1.sql     |  8 +++
 icinga-web.spec                                    | 60 ++++++++++-------
 lib/agavi/Makefile.in                              |  2 +-
 lib/raphael/Makefile.in                            |  4 --
 53 files changed, 341 insertions(+), 188 deletions(-)

diff --cc debian/changelog
index 204cc93,e7729a2..2024ca2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,21 @@@
+ icinga-web (1.10.1-1) unstable; urgency=medium
+ 
+   * [a65c068] Imported Upstream version 1.10.1
+   * [a85c19d] Added database schema updates for 1.10.1
+   * [0d47dfe] Added lintian override for irrelevant privacy-breach-donation
+   * [f6c0957] Bumped standards to 3.9.5
+   * [6a4d77c] Added updated watch file for GitHub releases
+   * [4ba4364] Added php5-mysqlnd as an alternative MySQL driver
+     (Closes: #735969)
+ 
+  -- Markus Frosch <markus at lazyfrosch.de>  Wed, 19 Feb 2014 18:10:58 +0100
+ 
 +icinga-web (1.10.0-2~debmon70+1) debmon-wheezy; urgency=medium
 +
 +  * Rebuild for debmon-wheezy
 +
 + -- Markus Frosch <markus at lazyfrosch.de>  Tue, 14 Jan 2014 12:02:55 +0100
 +
  icinga-web (1.10.0-2) unstable; urgency=medium
  
    * [9d4c780] Removed unnecessary dependency on icinga-core (Closes: #731840)

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