[DRE-commits] [ruby-json] 01/01: Add Conflicts: ruby-json-pure (#847141)

[Micah Anderson]

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

micah pushed a commit to branch master
in repository ruby-json.

commit 1c5b88967273fa9ca55d28daa97330262c2b9fad
Author: Micah Anderson <micah at riseup.net>
Date:   Mon Dec 5 18:33:29 2016 -0500

    Add Conflicts: ruby-json-pure (#847141)
---
 debian/changelog | 6 ++++++
 debian/control   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 95bf5ce..d29ba3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-json (2.0.1+dfsg-3) unstable; urgency=medium
+
+  * Add Conflicts: ruby-json-pure (Closes: #847141)
+
+ -- Micah Anderson <micah at debian.org>  Mon, 05 Dec 2016 18:33:24 -0500
+
 ruby-json (2.0.1+dfsg-2) unstable; urgency=medium
 
   * Add patch debian/patches/0003-Remove-additional-gemspec-files.patch to
diff --git a/debian/control b/debian/control
index 5be4db0..5192e68 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ XB-Ruby-Versions: ${ruby:Versions}
 Depends: ruby | ruby-interpreter,
          ${misc:Depends},
          ${shlibs:Depends}
+Conflicts: ruby-json-pure
 Description: JSON library for Ruby
  This library implements the JSON (JavaScript Object Notation) specification in
  Ruby, allowing the developer to easily convert data between Ruby and JSON. You

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