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

[Markus Frosch]

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

lazyfrosch pushed a commit to branch debmon-wheezy
in repository pkg-icinga2.

commit 253b3e5f38734941c0eec8ab1cc4a7ba49b8f6cf
Merge: d83d7a3 93d1fb2
Author: Markus Frosch <lazyfrosch at debian.org>
Date:   Fri Feb 5 14:22:59 2016 +0100

    Merge branch 'master' into debmon-wheezy

 debian/.gitignore                          |  1 +
 debian/changelog                           | 20 +++++++++
 debian/control                             | 21 +++++++--
 debian/copyright                           | 68 +++++++++---------------------
 debian/icinga2-classicui.lintian-overrides |  3 ++
 debian/icinga2-common.bash-completion      |  1 +
 debian/icinga2-common.icinga2.init         |  1 +
 debian/icinga2-common.install              |  3 +-
 debian/icinga2-common.postinst             |  3 ++
 debian/icinga2-common.postrm               |  1 +
 debian/icinga2-common.preinst              | 10 +++++
 debian/icinga2-common.prerm                | 10 +++++
 debian/icinga2-studio.menu                 |  3 --
 debian/rules                               | 16 ++++---
 debian/vim-icinga2.README.Debian           | 13 ++++++
 debian/vim-icinga2.install                 |  3 ++
 debian/vim-icinga2.yaml                    |  5 +++
 17 files changed, 118 insertions(+), 64 deletions(-)

diff --cc debian/changelog
index 9a1fa2c,7e3688a..5b31015
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,23 +1,29 @@@
+ icinga2 (2.4.1-2) unstable; urgency=medium
+ 
+   [ Alexander Wirt ]
+   * [09024ca] Fail on reload if daemon isn't running
+ 
+   [ Markus Frosch ]
+   * [dafe178] Fix rules for binary-{arch,indep} (Closes: #806623)
+   * [522fca2] Add vim-icinga2 syntax package
+   * [9261421] Don't install all the syntax files with icinga2-common
+   * [b4f5917] Install nanorc properly with icinga2-common
+   * [89b3a4a] Move bash-completion to /usr/share
+   * [53e9965] Remove obsolete menu file for icinga2-studio
+   * [108f078] Update lintian-overrides for icinga2-classicui
+   * [5a824b1] Update VCS URLs to secure
+   * [6222da3] Update copyright
+   * [ee74d47] Remove features-enabled on purge
+   * [ccb8bbe] Enable verbose cmake output for build log validation
+ 
+  -- Markus Frosch <lazyfrosch at debian.org>  Thu, 04 Feb 2016 16:55:46 +0100
+ 
 +icinga2 (2.4.1-1~debmon70+1) debmon-wheezy; urgency=medium
 +
 +  * Rebuild for debmon-wheezy.
 +
 + -- Alexander Wirt <formorer at debian.org>  Thu, 27 Aug 2015 13:33:01 +0200
 +
  icinga2 (2.4.1-1) unstable; urgency=medium
  
    * [9725e3c] Add proper conflicts and replaces from icinga2-bin to libicinga2
diff --cc debian/control
index 6f73670,5679963..d3c06f1
--- a/debian/control
+++ b/debian/control
@@@ -5,9 -5,11 +5,10 @@@ Maintainer: Debian Nagios Maintainer Gr
  Uploaders: Markus Frosch <lazyfrosch at debian.org>,
             Jan Wagner <waja at cyconet.org>,
             Alexander Wirt <formorer at debian.org>
- Build-Depends: bison,
+ Build-Depends: bash-completion,
+                bison,
                 cmake (>= 2.8.7),
                 debhelper (>= 9),
 -               dh-systemd (>= 1.5),
                 flex,
                 g++ (>= 1.96),
                 libboost-dev,
diff --cc debian/rules
index 9e8000c,0889676..f40a42d
--- a/debian/rules
+++ b/debian/rules
@@@ -3,7 -3,7 +3,7 @@@
  #export DH_VERBOSE=1
  
  %:
- 	dh $@
 -	dh $@ --with systemd --with bash_completion
++	dh $@ --with bash_completion
  
  override_dh_systemd_enable:
  	dh_systemd_enable --name=icinga2

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