[DRE-commits] [SCM] ruby-chronic.git branch, master, updated. debian/0.6.7-1-2-g5f0af14

[Per Andersson]

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

    Relax conflicts of transitional package to breaks.

diff --git a/debian/changelog b/debian/changelog
index 54b07df..447b39b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-chronic (0.6.7-2) unstable; urgency=low
+
+  * Relax conflicts of transitional packages to breaks.
+
+ -- Per Andersson <avtobiff at gmail.com>  Sat, 09 Jun 2012 00:16:15 +0200
+
 ruby-chronic (0.6.7-1) unstable; urgency=low
 
   * New maintainer. (Closes: #660501)
diff --git a/debian/control b/debian/control
index 1c4dd14..3d5f781 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: libchronic-ruby (<< 0.6.7-1~)
-Conflicts: libchronic-ruby (<< 0.6.7-1~)
+Breaks: libchronic-ruby (<< 0.6.7-1~)
 Provides: libchronic-ruby
 Description: natural language date parser
  Chronic is a natural language date/time parser written in pure Ruby.

-- 
ruby-chronic.git