[DRE-commits] [ruby-twitter] 01/02: conflict and replace ruby-twitter4r

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository ruby-twitter.

commit 46f23aaa003dbabe8bb419b372cd21c600af1fd6
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Nov 26 14:01:27 2014 +0530

    conflict and replace ruby-twitter4r
---
 debian/changelog | 5 +++--
 debian/control   | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6fa4aa4..a340cca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-ruby-twitter (5.11.0-2) UNRELEASED; urgency=medium
+ruby-twitter (5.11.0-2) unstable; urgency=medium
 
   * Team upload.
   * Add ruby-buftok to depends.
+  * Conflict and Replace ruby-twitter4r (closes: #768160).
 
- -- Pirate Praveen <praveen at debian.org>  Sun, 23 Nov 2014 06:20:30 +0530
+ -- Pirate Praveen <praveen at debian.org>  Wed, 26 Nov 2014 14:01:21 +0530
 
 ruby-twitter (5.11.0-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 322ae28..770ee5d 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-faraday (>= 0.9.0), ruby-multi-json (>= 1.0), ruby-simple-oauth (>= 0.2),
  ruby-equalizer, ruby-http, ruby-http-parser.rb, ruby-memoizable, ruby-naught,
  ruby-buftok
+Conflicts: ruby-twitter4r
+Replaces: ruby-twitter4r
 Description: Ruby interface to the Twitter API
  This ruby library provides a convenient access to the Twitter API.
  This provides comprehensive methods to access the API. This library

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-twitter.git