[DRE-commits] [SCM] ruby-diff-lcs.git branch, master, updated. upstream/1.1.2-12-g06e721e

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit c054f1041813003bc5d812aa03ae94c0a3487d8d
Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
Date:   Sun Oct 9 11:43:36 2011 +0200

    Conflicts -> Breaks.

diff --git a/debian/control b/debian/control
index 3fd1fdc..c06893f 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter
 Replaces: libdifflcs-ruby1.8 (<< 1.1.2-7~), libdifflcs-ruby1.9.1 (<< 1.1.2-7~), libdifflcs-ruby (<< 1.1.2-7~)
-Conflicts: libdifflcs-ruby1.8 (<< 1.1.2-7~), libdifflcs-ruby1.9.1 (<< 1.1.2-7~), libdifflcs-ruby (<< 1.1.2-7~)
+Breaks: libdifflcs-ruby1.8 (<< 1.1.2-7~), libdifflcs-ruby1.9.1 (<< 1.1.2-7~), libdifflcs-ruby (<< 1.1.2-7~)
 Provides: libdifflcs-ruby1.8, libdifflcs-ruby1.9.1, libdifflcs-ruby
 Description: McIlroy-Hunt longest common subsequence algorithm implementation
  Diff::LCS is a port of Algorithm::Diff that uses the McIlroy-Hunt

-- 
ruby-diff-lcs.git