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

[Alexander Wirt]

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

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

commit d8f588e60ea0fdf93e39e496bf6bf0e0b3408123
Merge: 1bd7aaa aaab1e0
Author: Alexander Wirt <formorer at debian.org>
Date:   Fri Jan 27 11:21:53 2017 +0100

    Merge branch 'master' into ubuntu_trusty

 ChangeLog                                          | 14 +++++
 README.md                                          |  4 +-
 RELEASE.md                                         |  4 +-
 VERSION                                            |  2 +-
 application/VERSION                                |  2 +-
 .../controllers/ApplicationStateController.php     |  2 +-
 application/controllers/IndexController.php        |  2 +-
 application/controllers/RoleController.php         |  2 +-
 .../forms/Navigation/NavigationConfigForm.php      |  2 +-
 application/locale/ar_SA/LC_MESSAGES/icinga.po     |  2 +-
 application/locale/de_DE/LC_MESSAGES/icinga.po     |  2 +-
 application/locale/fi_FI/LC_MESSAGES/icinga.po     |  2 +-
 application/locale/pt_BR/LC_MESSAGES/icinga.po     |  2 +-
 application/views/scripts/about/index.phtml        | 14 ++---
 .../views/scripts/authentication/login.phtml       |  4 +-
 changelog.py                                       |  8 +--
 debian/changelog                                   | 14 +++--
 debian/patches/10_revert_dompdf_update             | 66 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 doc/02-Installation.md                             | 44 +++++++--------
 doc/90-SELinux.md                                  |  2 +-
 icingaweb2.spec                                    | 16 +++---
 library/Icinga/Application/Hook.php                | 10 +++-
 library/Icinga/Application/Version.php             |  2 +-
 library/Icinga/Authentication/Auth.php             |  2 +-
 library/Icinga/Protocol/Ldap/LdapUtils.php         |  4 +-
 library/Icinga/Protocol/Ldap/Node.php              |  4 +-
 library/Icinga/Protocol/Ldap/Root.php              |  4 +-
 library/Icinga/Protocol/Livestatus/Connection.php  |  4 +-
 .../Web/Controller/ControllerTabCollector.php      |  2 +-
 library/Icinga/Web/Widget.php                      |  4 +-
 library/Icinga/Web/Widget/AbstractWidget.php       |  4 +-
 library/vendor/Zend/README.md                      |  2 +-
 modules/doc/module.info                            |  2 +-
 .../locale/ar_SA/LC_MESSAGES/monitoring.po         |  2 +-
 .../locale/de_DE/LC_MESSAGES/monitoring.po         |  2 +-
 .../locale/it_IT/LC_MESSAGES/monitoring.po         |  2 +-
 .../locale/pt_BR/LC_MESSAGES/monitoring.po         |  2 +-
 modules/monitoring/doc/commandtransports.md        |  4 +-
 .../Monitoring/Backend/Ido/Query/IdoQuery.php      |  2 +-
 .../Command/Transport/CommandTransport.php         |  3 +-
 .../library/Monitoring/Object/MonitoredObject.php  |  2 +-
 modules/monitoring/module.info                     |  2 +-
 .../test/php/regression/Bug11728Test.php           |  2 +-
 .../test/php/regression/Bug11796Test.php           |  2 +-
 .../monitoring/test/php/regression/Bug6088Test.php |  2 +-
 .../application/locale/de_DE/LC_MESSAGES/setup.po  |  2 +-
 .../application/locale/it_IT/LC_MESSAGES/setup.po  |  2 +-
 .../views/scripts/form/setup-welcome.phtml         |  2 +-
 .../application/views/scripts/index/index.phtml    |  4 +-
 modules/setup/library/Setup/Utils/DbTool.php       |  2 +-
 modules/setup/module.info                          |  2 +-
 modules/test/module.info                           |  2 +-
 modules/translation/doc/translation.md             |  2 +-
 .../Translation/Util/GettextTranslationHelper.php  |  2 +-
 modules/translation/module.info                    |  2 +-
 packages/RPM.md                                    |  2 +-
 packages/debian/control                            |  4 +-
 public/js/icinga/behavior/application-state.js     |  2 +-
 .../Icinga/Data/DataArray/ArrayDatasourceTest.php  |  4 +-
 test/php/library/Icinga/Data/Filter/FilterTest.php | 10 ++--
 test/php/regression/Bug11831Test.php               |  2 +-
 test/php/regression/Bug4102Test.php                |  2 +-
 test/php/regression/Bug6284Test.php                |  2 +-
 test/php/regression/Bug6432Test.php                |  2 +-
 .../php/res/locale/de_DE/LC_MESSAGES/icingatest.po |  2 +-
 66 files changed, 215 insertions(+), 121 deletions(-)

diff --cc debian/changelog
index ef6ac50,bb9dd6e..6802997
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,16 @@@
- icingaweb2 (2.4.0-1~ppa1404+1) trusty; urgency=medium
++icingaweb2 (2.4.1-1~ppa1404+1) trusty; urgency=medium
 +
-   * [91dcf64] ubuntu: Use Zend embedding like Debian
-   * [2b92d1b] ubuntu: Update dompdf paths
 +  * Rebuild for Ubuntu trusty.
 +
-  -- Markus Frosch <lazyfrosch at debian.org>  Tue, 13 Dec 2016 16:23:26 +0100
++ -- Alexander Wirt <formorer at debian.org>  Fri, 27 Jan 2017 11:21:34 +0100
++
+ icingaweb2 (2.4.1-1) unstable; urgency=medium
+ 
+   * [21444ed] Add patch 10_revert_dompdf_update
+               to allow use of DOMPDF 0.6.x
+   * [9bd86b8] New upstream version 2.4.1
+ 
+  -- Markus Frosch <lazyfrosch at debian.org>  Fri, 20 Jan 2017 14:24:33 +0100
  
  icingaweb2 (2.4.0-1) unstable; urgency=medium
  

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