[DRE-commits] [SCM] ruby-hmac.git branch, master, updated. upstream/0.4.0-12-geaa4903

[Vasudev Kamath]

The following commit has been merged in the master branch:
commit eaa490303334dd5b0bbd47d58828445f9e7477d3
Author: Vasudev Kamath <kamathvasudev at gmail.com>
Date:   Wed Jun 20 22:20:00 2012 +0530

    Changed conflicts to breaks

diff --git a/debian/control b/debian/control
index 10b97b1..d8e37ea 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Depends: ${misc:Depends},
          ${shlibs:Depends},
          ruby1.8 | ruby-interpreter
 Replaces: libhmac-ruby1.8 (<< 0.4.0-1~), libhmac-ruby (<< 0.4.0-1~)
-Conflicts: libhmac-ruby1.8 (<< 0.4.0-1~), libhmac-ruby (<< 0.4.0-1~),
+Breaks: libhmac-ruby1.8 (<< 0.4.0-1~), libhmac-ruby (<< 0.4.0-1~),
            libopenid-ruby1.8 (<< 1.1.4-2)
 Provides: libhmac-ruby1.8, libhmac-ruby
 Description: Ruby interface for HMAC algorithm

-- 
ruby-hmac.git