[Pkg-nagios-changes] [SCM] Debian packaging for Nagios3 branch, master, updated. 3.2.1-1-2-gcb4a46c

[Alexander Wirt]

The following commit has been merged in the master branch:
commit cb4a46c5c02f8c36e40bacbfa059b53be8ea424a
Author: Alexander Wirt <formorer at grml.org>
Date:   Fri Jul 2 09:13:58 2010 +0200

    Bump standards version, Fix nagios3-cgi replaces

diff --git a/debian/changelog b/debian/changelog
index be007fb..acd4f7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+nagios3 (3.2.1-2) unstable; urgency=low
+
+  * Fix "Missing conflict with nagios3 v3.0.6-4~lenny2 (/usr/lib/cgi-
+    bin/nagios3/extinfo.cgi": add a versioned Replaces/Breaks on nagios3 to
+    nagios3-cgi (Closes: #585410). Make the other Replaces versioned too and
+    also add them to the new Breaks.
+
+    Thanks to Gregor Herrmann for the patch
+
+  * Bump Standards version (no changes)
+
+ -- Alexander Wirt <formorer at debian.org>  Fri, 02 Jul 2010 09:09:10 +0200
+
 nagios3 (3.2.1-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/control b/debian/control
index 21fa2c2..fca82a0 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: sean finney <seanius at debian.org>, Alexander Wirt <formorer at debian.org
 Homepage: http://www.nagios.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-nagios/pkg-nagios3.git
 Vcs-Git: git://git.debian.org/pkg-nagios/pkg-nagios3.git
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Build-Depends: debhelper (>= 7), dpatch (>= 2.0.10), po-debconf, libperl-dev,
  libpng12-dev, libgd2-noxpm-dev (>= 2.0.1) | libgd2-xpm-dev (>= 2.0.1), iputils-ping,
  autotools-dev, dpkg-dev (>= 1.13.19)
@@ -42,7 +42,8 @@ Description: support files for nagios3
 
 Package: nagios3-cgi
 Architecture: any
-Replaces: nagios3-common, nagios3-doc
+Replaces: nagios3-common (<< 3.2.0), nagios3-doc (<< 3.2.0), nagios3 (<< 3.2.0)
+Breaks: nagios3-common (<< 3.2.0), nagios3-doc (<< 3.2.0), nagios3 (<< 3.2.0)
 Depends: nagios3-common (= ${source:Version}), coreutils (>= 4.5.3), ucf (>= 0.28), apache2-utils, ${misc:Depends}, ${perl:Depends}, ${misc:Depends}, ${shlibs:Depends}, adduser, libapache2-mod-php5 | php5 | php5-cgi
 Recommends: apache2 | httpd, nagios-images (>> 0.1)
 Description: cgi files for nagios3

-- 
Debian packaging for Nagios3