[DRE-commits] [SCM] ruby-shoulda-context.git branch, master, updated. debian/1.0.0_beta1-1-14-gc91617d

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit c91617d977120a05cbb7f9cd85d59a4a87206b9f
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed May 22 23:29:16 2013 +0530

    remove libshoulda* in Conflicts

diff --git a/debian/changelog b/debian/changelog
index e62f52f..6f509cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-shoulda-context (1.1.2-2) UNRELEASED; urgency=low
+
+  * Remove libshoulda* in Conflicts
+
+ -- Praveen Arimbrathodiyil <praveen at debian.org>  Wed, 22 May 2013 23:28:36 +0530
+
 ruby-shoulda-context (1.1.2-1) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index ab2c4f4..e7806a8 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Package: ruby-shoulda-context
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-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