[DRE-commits] [SCM] ruby-rest-client.git branch, master, updated. upstream/1.6.3-9-gb817f24

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit b817f249b10180fa4ee90ae8060e85690782d447
Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
Date:   Sun Sep 25 11:41:42 2011 +0200

    Switch from conflicts to breaks as recommended by lintian.

diff --git a/debian/changelog b/debian/changelog
index 97bdb2f..a0e21d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 ruby-rest-client (1.6.7-1) unstable; urgency=low
 
   * New upstream release.
+  * Switch from conflicts to breaks as recommended by lintian.
 
- -- Lucas Nussbaum <lucas at debian.org>  Sun, 25 Sep 2011 11:39:02 +0200
+ -- Lucas Nussbaum <lucas at debian.org>  Sun, 25 Sep 2011 11:41:30 +0200
 
 ruby-rest-client (1.6.3-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 5d143be..340c47b 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, ruby-mime-types
 Replaces: librestclient-ruby1.8 (<< 1.6.1-2~), librestclient-ruby (<< 1.6.1-2~)
-Conflicts: librestclient-ruby1.8 (<< 1.6.1-2~), librestclient-ruby (<< 1.6.1-2~)
+Breaks: librestclient-ruby1.8 (<< 1.6.1-2~), librestclient-ruby (<< 1.6.1-2~)
 Provides: librestclient-ruby1.8, librestclient-ruby
 Description: simple REST client for Ruby
  A simple HTTP and REST client for Ruby, inspired by the Sinatra microframework

-- 
ruby-rest-client.git