[DRE-commits] [SCM] ruby-json.git branch, master, updated. upstream/1.5.1-22-g7f09c00

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit e9431a3dc77c25b0d3f7ad900f8d629706fbb491
Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
Date:   Sat Jul 30 08:12:41 2011 +0200

    update standards-version and update to modern gem2deb standards

diff --git a/debian/control b/debian/control
index c0a6d3b..2a373b2 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.al
 Uploaders: Lucas Nussbaum <lucas at debian.org>, Antonio Terceiro <terceiro at softwarelivre.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.6~)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-json.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-json.git;a=summary
 Homepage: http://flori.github.com/json
@@ -14,9 +14,9 @@ XS-Ruby-Versions: all
 Package: ruby-json
 Architecture: any
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
 Replaces: libjson-ruby (<< 1.5.1-1~), libjson-ruby-doc (<< 1.5.1-1~), libjson-ruby1.8 (<< 1.5.1-1~)
-Conflicts: libjson-ruby (<< 1.5.1-1~), libjson-ruby-doc (<< 1.5.1-1~), libjson-ruby1.8 (<< 1.5.1-1~)
+Breaks: libjson-ruby (<< 1.5.1-1~), libjson-ruby-doc (<< 1.5.1-1~), libjson-ruby1.8 (<< 1.5.1-1~)
 Provides: libjson-ruby, libjson-ruby-doc, libjson-ruby1.8
 Description: JSON library for Ruby
  This library implements the JSON (JavaScript Object Notation) specification in

-- 
ruby-json.git