[DRE-commits] [SCM] ruby-shoulda.git branch, master, updated. 151ef8fe8afc2d595c27ff051a6c400560ded4db

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 6f7e36ffc74ef73f3736ad6f1e0f489630548457
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Mon Jun 6 22:47:26 2011 -0700

    Fix versioned Conflicts: with old packages

diff --git a/debian/control b/debian/control
index 40d0f5b..00ab47c 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Package: ruby-shoulda
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter, ruby-shoulda-context, ruby-shoulda-matchers
-Replaces: libshoulda-ruby (<< 2.11.3-1~), libshoulda-ruby1.8 (<< 2.11.3-1~)
-Conflicts: libshoulda-ruby (<< 2.11.3-1~), libshoulda-ruby1.8 (<< 2.11.3-1~)
+Replaces: libshoulda-ruby (<< 3.0.0~beta2-1~), libshoulda-ruby1.8 (<< 3.0.0~beta2-1~)
+Conflicts: libshoulda-ruby (<< 3.0.0~beta2-1~), libshoulda-ruby1.8 (<< 3.0.0~beta2-1~)
 Provides: libshoulda-ruby, libshoulda-ruby1.8
 Description: additional features for the Test::Unit testing framework
  Shoulda makes it easy to write elegant, understandable, and maintainable

-- 
ruby-shoulda.git