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

[Alexander Wirt]

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

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

commit fdec9ece981f62b74bccdc958d8cfcba5a2bdce2
Merge: 20bb042 4c3bc2a
Author: Alexander Wirt <formorer at debian.org>
Date:   Wed Aug 31 15:39:27 2016 +0200

    Merge branch 'master' into ubuntu-noma

 ChangeLog                        |  6 ++++++
 RELEASE.md                       | 28 +++++++++++++++++++---------
 debian/changelog                 |  9 ++++++++-
 debian/control                   |  4 ++--
 doc/1-about.md                   |  6 ++++++
 icinga2.nuspec                   |  2 +-
 icinga2.spec                     |  2 +-
 lib/checker/checkercomponent.cpp |  4 ++++
 tools/chocolateyInstall.ps1      |  4 ++--
 9 files changed, 49 insertions(+), 16 deletions(-)

diff --cc debian/changelog
index 6f7cdc8,adb6262..6873182
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
- icinga2 (2.5.3-1~ppa1~precise1) precise; urgency=medium
++icinga2 (2.5.4-1~ppa1~precise1) precise; urgency=medium
 +
 +  * Rebuild for my ubuntu ppa
 +
 + -- Alexander Wirt <formorer at debian.org>  Thu, 19 May 2016 14:31:06 +0200
 +
+ icinga2 (2.5.4-1) unstable; urgency=medium
+ 
+   * [7cf17d9] Recommend specific icinga-doc version
+   * [d2c5d89] New upstream version 2.5.4
+ 
+  -- Alexander Wirt <formorer at debian.org>  Wed, 31 Aug 2016 10:31:34 +0200
+ 
  icinga2 (2.5.3-1) unstable; urgency=medium
  
    * [6cd83c4] Imported Upstream version 2.5.3
diff --cc debian/control
index a67de72,bc11768..c44657e
--- a/debian/control
+++ b/debian/control
@@@ -25,10 -24,10 +25,10 @@@ Build-Depends: bash-completion
                 libssl-dev,
                 libyajl-dev,
                 libedit-dev,
 -               libwxgtk3.0-dev,
 +#               libwxgtk3.0-dev,
                 make (>= 3.81),
                 po-debconf
- Standards-Version: 3.9.7
+ Standards-Version: 3.9.8
  Homepage: http://www.icinga.org
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-nagios/pkg-icinga2.git
  Vcs-Git: https://anonscm.debian.org/git/pkg-nagios/pkg-icinga2.git
@@@ -38,8 -37,8 +38,8 @@@ Architecture: an
  Depends: icinga2-bin (= ${binary:Version}),
           icinga2-common (= ${source:Version}),
           ${misc:Depends}
- Recommends: icinga2-doc, monitoring-plugins-basic | nagios-plugins-basic, libreadline6
+ Recommends: icinga2-doc (= ${binary:Version}), monitoring-plugins-basic | nagios-plugins-basic, libreadline6
 -Suggests: icinga2-studio, vim-icinga2
 +Suggests: vim-icinga2
  Description: host and network monitoring system
   Icinga 2 is a general-purpose monitoring application to fit the needs of
   any size of network. Icinga 1.x was a Nagios fork; this new generation

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