[DRE-commits] [SCM] ruby-lockfile.git branch, master, updated. debian/2.1.0-1-7-gd8c8119

[Per Andersson]

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

    Relax conflicts with transitional package to breaks.

diff --git a/debian/control b/debian/control
index 1331366..3d5316d 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: liblockfile-ruby (<< 2.1.0-1~)
-Conflicts: liblockfile-ruby (<< 2.1.0-1~)
+Breaks: liblockfile-ruby (<< 2.1.0-1~)
 Provides: liblockfile-ruby
 Description: create NFS-safe lockfiles
  This is a Ruby library for creating lockfiles safe for use over NFS (Network

-- 
ruby-lockfile.git