[DRE-commits] [SCM] chef.git branch, master, updated. debian/0.10.10-1-5-gf24bcca

[Tollef Fog Heen]

The following commit has been merged in the master branch:
commit ccf746fe5e1b3afd52b31e6c073e9656845e638d
Author: Tollef Fog Heen <tfheen at debian.org>
Date:   Tue Jun 5 17:45:50 2012 +0200

    Make conflicts/replaces on old packages be versioned.  Closes: #675370

diff --git a/debian/changelog b/debian/changelog
index f8fc0e7..cd52270 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+chef (0.10.10-2) unstable; urgency=low
+
+  * Make conflicts/replaces on old packages be versioned.  Closes: #675370
+
+ -- Tollef Fog Heen <tfheen at debian.org>  Tue, 05 Jun 2012 17:45:30 +0200
+
 chef (0.10.10-1) unstable; urgency=low
 
   * New upstream release, reintroduce in Debian.
diff --git a/debian/control b/debian/control
index 92bfea0..85ed49b 100644
--- a/debian/control
+++ b/debian/control
@@ -33,8 +33,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
 	 ruby-moneta,
 	 ruby-uuidtools
 Provides: libchef-ruby, libchef-ruby1.8
-Conflicts: libchef-ruby, libchef-ruby1.8
-Replaces: libchef-ruby, libchef-ruby1.8
+Conflicts: libchef-ruby (<< 0.10.10-1~), libchef-ruby1.8 (<< 0.10.10-1~)
+Replaces: libchef-ruby (<< 0.10.10-1~), libchef-ruby1.8 (<< 0.10.10-1~)
 Description: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure.
  Chef is a systems integration framework and configuration management library
  written in Ruby. Chef provides a Ruby library and API that can be used to

-- 
chef.git