[DRE-commits] [SCM] ruby-shoulda-matchers.git branch, master, updated. 29ead45435310005b1bb4cde7ef8adea825e7a34

[Antonio Terceiro]

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

    Fix versioned Conflicts: with libshoulda-ruby*

diff --git a/debian/control b/debian/control
index 6110ffb..38bc01e 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Package: ruby-shoulda-matchers
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-Conflicts: libshoulda-ruby (<< 2.11.3-1~), libshoulda-ruby1.8 (<< 2.11.3-1~)
+Conflicts: libshoulda-ruby (<< 3.0.0~beta2-1~), libshoulda-ruby1.8 (<< 3.0.0~beta2-1~)
 Description: Test helpers for Rails applications, compatible with Test::Unit and RSpec
  Test::Unit- and RSpec-compatible one-liners that test common Rails
  functionality. These tests would otherwise be much longer, more complex, and

-- 
ruby-shoulda-matchers.git