[DRE-commits] [SCM] ruby-daemons.git branch, master, updated. debian/1.1.3-1-7-gee8ed3e

[Lucas Nussbaum]

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

    Conflicts -> Breaks

diff --git a/debian/control b/debian/control
index 8acebcc..80d7780 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: libdaemons-ruby (<< 1.1.3-1~), libdaemons-ruby1.8 (<< 1.1.3-1~)
-Conflicts: libdaemons-ruby (<< 1.1.3-1~), libdaemons-ruby1.8 (<< 1.1.3-1~)
+Breaks: libdaemons-ruby (<< 1.1.3-1~), libdaemons-ruby1.8 (<< 1.1.3-1~)
 Provides: libdaemons-ruby, libdaemons-ruby1.8
 Description: Ruby daemons library
  Daemons provides an easy way to wrap existing ruby scripts (for example

-- 
ruby-daemons.git