[DRE-commits] [SCM] ruby-shoulda-context.git branch, master, updated. febf0c58f57f1de308980529ddb8d11adbfe9d83

[Antonio Terceiro]

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

    Fix versioned Conflicts: with libshoulda-ruby*

diff --git a/debian/control b/debian/control
index f88bcc2..6b64ee8 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Package: ruby-shoulda-context
 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: context framework for Test::Unit
  Shoulda’s contexts make it easy to write understandable and maintainable
  tests for Test::Unit. It’s fully compatible with your existing tests in

-- 
ruby-shoulda-context.git