[DRE-commits] [SCM] ruby-rspec-core.git branch, master, updated. upstream/2.5.1-17-g4ef689a

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 28493b7cb1687184ccc4633a85fb0611e980e486
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Tue Feb 14 16:09:11 2012 +0100

    control: add myself to uploaders, update dependencies and standards-version

diff --git a/debian/control b/debian/control
index c6572a5..4766fda 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,10 @@ Source: ruby-rspec-core
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Lucas Nussbaum <lucas at lucas-nussbaum.net>
+Uploaders: Lucas Nussbaum <lucas at lucas-nussbaum.net>, Cédric Boutillier <cedric.boutillier at gmail.com>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.1), rake, ruby-rspec-expectations, ruby-rspec-mocks
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.1), rake, ruby-rspec-expectations (>= 0.2.8~), ruby-rspec-mocks, ruby-childprocess, ruby-fakefs, ruby-nokogiri
+Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-rspec-core.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-rspec-core.git;a=summary
 Homepage: http://github.com/rspec/rspec-core
@@ -14,8 +14,9 @@ XS-Ruby-Versions: all
 Package: ruby-rspec-core
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter
-Conflicts: librspec-ruby1.8 (<< 2.5.0-1~), librspec-ruby1.9.1 (<< 2.5.0-1~), librspec-ruby (<< 2.5.0-1~)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
+Breaks: librspec-ruby1.8 (<< 2.5.0-1~), librspec-ruby1.9.1 (<< 2.5.0-1~), librspec-ruby (<< 2.5.0-1~)
+Replaces: librspec-ruby1.8 (<< 2.5.0-1~), librspec-ruby1.9.1 (<< 2.5.0-1~), librspec-ruby (<< 2.5.0-1~)
 Suggests: ruby-rspec
 Description: Behaviour Driven Development framework for Ruby - core
  RSpec is a Behaviour Driven Development framework for Ruby. It

-- 
ruby-rspec-core.git