[DRE-commits] [SCM] ruby-trollop.git branch, master, updated. debian/1.16.2-1-5-g27dc873

[Per Andersson]

The following commit has been merged in the master branch:
commit 27dc87397b51e79037013ef10b1cbdbe2b98e3bb
Author: Per Andersson <avtobiff at gmail.com>
Date:   Sat Jun 9 00:38:16 2012 +0200

    Relax conflicts with transitional package to breaks.

diff --git a/debian/changelog b/debian/changelog
index f0a7d85..a874c41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ruby-trollop (1.16.2-2) unstable; urgency=low
 
   * Correct binary ruby versions tag.
   * Fix path setup in debian/ruby-tests.rb.
+  * Relax conflicts with transitional package to breaks.
 
  -- Per Andersson <avtobiff at gmail.com>  Fri, 08 Jun 2012 23:40:26 +0200
 
diff --git a/debian/control b/debian/control
index d90dc43..e5882ac 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
 Replaces: libtrollop-ruby (<< 1.16.2-1~)
-Conflicts: libtrollop-ruby (<< 1.16.2-1~)
+Breaks: libtrollop-ruby (<< 1.16.2-1~)
 Provides: libtrollop-ruby
 Description: command-line argument processing library
  Trollop is YAFCLAP --- yet another fine commandline argument processor

-- 
ruby-trollop.git