[DRE-commits] [SCM] ruby-gnuplot.git branch, master, updated. upstream/2.3.6-14-gbb5f0df

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 630bd53db13fdd658208bfaaa8d564486a78cbcd
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Mon Jun 11 00:50:41 2012 +0200

    Replace Conflicts by Breaks

diff --git a/debian/control b/debian/control
index b906e01..0d2c39b 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, gnuplot
 Replaces: libgnuplot-ruby1.8 (<< 2.3.6-1~), libgnuplot-ruby (<< 2.3.6-1~)
-Conflicts: libgnuplot-ruby1.8 (<< 2.3.6-1~), libgnuplot-ruby (<< 2.3.6-1~)
+Breaks: libgnuplot-ruby1.8 (<< 2.3.6-1~), libgnuplot-ruby (<< 2.3.6-1~)
 Provides: libgnuplot-ruby1.8, libgnuplot-ruby
 Description: Ruby library to interact with gnuplot
  Gnuplot is a program that has a rich language for the generation of plots.

-- 
ruby-gnuplot.git