[Pkg-nagios-changes] [icinga] 01/01: Merge branch 'master' into ubuntu-lucid

[Alexander Wirt]

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

formorer pushed a commit to branch ubuntu-lucid
in repository icinga.

commit 62125c53bb9770026030a55a9fd7085df59a96e4
Merge: b0ffadc 698ab3a
Author: Alexander Wirt <formorer at debian.org>
Date:   Sat Mar 14 22:21:34 2015 +0100

    Merge branch 'master' into ubuntu-lucid
    
    Conflicts:
    	debian/changelog

 debian/changelog | 8 +++++++-
 debian/control   | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 1b0ded3,0139696..ad0077f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
- icinga (1.12.2-1~ppa1~vivid1) vivid; urgency=medium
++icinga (1.12.2-2~ppa1~vivid1) vivid; urgency=medium
 +
 +  * Rebuild for my ubuntu ppa
 +
 + -- Alexander Wirt <formorer at debian.org>  Tue, 13 May 2014 15:09:37 +0200
 +
+ icinga (1.12.2-2) experimental; urgency=medium
+ 
+   * [17f0a2c] Fix plugin package name
+ 
+  -- Alexander Wirt <formorer at debian.org>  Sat, 14 Mar 2015 07:42:11 +0100
+ 
  icinga (1.12.2-1) experimental; urgency=medium
  
    * [ffdb896] Imported Upstream version 1.12.2
diff --cc debian/control
index 9b9928f,a12d972..482c93c
--- a/debian/control
+++ b/debian/control
@@@ -21,9 -21,9 +21,9 @@@ Architecture: al
  Depends: adduser,
           bsd-mailx | mailx,
           coreutils (>= 4.5.3),
 -         dpkg (>= 1.16.1),
 +         dpkg,
           lsb-base (>= 3.0-6),
-          monitoring-plugins-basic | icinga-plugins-basic,
+          monitoring-plugins-basic | nagios-plugins-basic,
           ucf (>= 0.28),
           ${misc:Depends},
           ${perl:Depends}

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