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

[Alexander Wirt]

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

formorer pushed a commit to branch ubuntu
in repository pkg-icinga2.

commit 5029a0a65dd1c8f22081b9c5731b9f7146763239
Merge: e2b64a6 509d654
Author: Alexander Wirt <formorer at debian.org>
Date:   Tue Dec 20 21:37:06 2016 +0100

    Merge branch 'master' into ubuntu

 debian/changelog                             |  14 +-
 debian/control                               |   5 +-
 debian/icinga2-common.icinga2.init           |   5 +
 debian/patches/30_use_libmysql               |   0
 debian/patches/41_ido_mysql57                | 366 +++++++++++++++++++++++++++
 debian/patches/42_mips_boost_bind_workaround |  50 ++++
 debian/patches/series                        |   3 +-
 debian/rules                                 |   4 +
 8 files changed, 443 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index 280dfa6,ee80d92..b2c65df
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,21 @@@
- icinga2 (2.6.0-1~ppa1~trusty2) trusty; urgency=medium
++icinga2 (2.6.0-2~ppa1~trusty2) trusty; urgency=medium
 +
 +  * Rebuild for my ubuntu ppa
 +
 + -- Alexander Wirt <formorer at debian.org>  Thu, 19 May 2016 14:38:41 +0200
 +
+ icinga2 (2.6.0-2) unstable; urgency=medium
+ 
+   * [e0f34e4] Add patch 41_ido_mysql57 - for compatibility with MySQL 5.7
+   * [6512d11] Remove obsolete patch 30_use_libmysql (empty)
+   * [16e341b] Recommend default-mysql-{server,client}
+   * [749f1fa] Adding missing dependency on lsb-base
+   * [4ed1e10] Update initscript to ignore SIGPIPE in daemon
+   * [5c10b76] Add patch 42_mips_boost_bind_workaround
+   * [86a23e5] makeshlibs: no scripts, we don't export shared libraries
+ 
+  -- Markus Frosch <lazyfrosch at debian.org>  Mon, 19 Dec 2016 16:13:45 +0100
+ 
  icinga2 (2.6.0-1) unstable; urgency=medium
  
    [ Alexander Wirt ]

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