[DRE-commits] [SCM] ruby-addressable.git branch, master, updated. upstream/2.2.6-20-gf09bbea

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit c2318b497a3e0033e1ffc624758956ab27611059
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Fri Jun 29 21:25:46 2012 +0200

    Replace Conflicts: with Breaks: for dependency relations on old packages

diff --git a/debian/control b/debian/control
index ff35181..d89e6a4 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter
 Replaces: libaddressable-ruby (<< 2.2.2-1~), libaddressable-ruby1.8 (<< 2.2.2-1~), libaddressable-ruby1.9.1 (<< 2.2.2-1~)
-Conflicts: libaddressable-ruby (<< 2.2.2-1~), libaddressable-ruby1.8 (<< 2.2.2-1~), libaddressable-ruby1.9.1 (<< 2.2.2-1~)
+Breaks: libaddressable-ruby (<< 2.2.2-1~), libaddressable-ruby1.8 (<< 2.2.2-1~), libaddressable-ruby1.9.1 (<< 2.2.2-1~)
 Provides: libaddressable-ruby, libaddressable-ruby1.8, libaddressable-ruby1.9.1
 Description: alternative URI implementation for Ruby
  Addressable is a replacement for the URI implementation that is part of

-- 
ruby-addressable.git