[Pkg-nagios-changes] [icinga] 01/01: Merge branch 'master' into debmon-squeeze
Alexander Wirt
formorer at debian.org
Sat Jun 13 05:24:26 UTC 2015
This is an automated email from the git hooks/post-receive script.
formorer pushed a commit to branch debmon-squeeze
in repository icinga.
commit b5ba72144938b7119c3772fd42397953e1b05a66
Merge: 55fd2da 698ab3a
Author: Alexander Wirt <formorer at debian.org>
Date: Sat Mar 14 07:50:49 2015 +0100
Merge branch 'master' into debmon-squeeze
Conflicts:
debian/changelog
debian/changelog | 8 +++++++-
debian/control | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --cc debian/changelog
index 0658a99,0139696..b3ca0ec
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
- icinga (1.12.2-1~debmon60+1) debmon-squeeze; urgency=medium
++icinga (1.12.2-2~debmon60+1) debmon-squeeze; urgency=medium
+
+ * Build for debmon-squeeze
+
+ -- Alexander Wirt <formorer at debian.org> Sun, 30 Mar 2014 16:50:10 +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 d2001bc,a12d972..b1b1de4
--- a/debian/control
+++ b/debian/control
@@@ -21,8 -21,9 +21,8 @@@ Architecture: al
Depends: adduser,
bsd-mailx | mailx,
coreutils (>= 4.5.3),
- dpkg (>= 1.16.1),
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
More information about the Pkg-nagios-changes
mailing list