[DRE-commits] [SCM] ruby-yajl.git branch, master, updated. debian/1.1.0-1-2-g2cbd5c2

[Tollef Fog Heen]

The following commit has been merged in the master branch:
commit cd8caccffd1661f1edbe4c3eaa0d12c21631370e
Author: Tollef Fog Heen <tfheen at debian.org>
Date:   Fri Apr 12 09:39:03 2013 +0200

    Add Conflicts and Replaces on libyajl-ruby for the benefit of users of third-party repositories.  Closes: #705261

diff --git a/debian/changelog b/debian/changelog
index bcf55b2..769e7c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-yajl (1.1.0-2) UNRELEASED; urgency=low
+
+  * Add Conflicts and Replaces on libyajl-ruby for the benefit of users of
+    third-party repositories.  Closes: #705261
+
+ -- Tollef Fog Heen <tfheen at debian.org>  Fri, 12 Apr 2013 09:32:05 +0200
+
 ruby-yajl (1.1.0-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index 4e6bb11..4f94cdd 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,8 @@ Package: ruby-yajl
 Architecture: any
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter 
+Replaces: libyajl-ruby
+Conflicts: libyajl-ruby
 Description: Ruby interface to Yajl, a JSON stream-based parser library
  Supported features include,
  . 

-- 
ruby-yajl.git