[DRE-commits] [SCM] ruby-capybara.git branch, master, updated. debian/2.1.0-1

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit 3e538636cb3d2bdf1d92599ac98b79314207f763
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Wed Jun 26 19:11:49 2013 +0200

    Refresh patches against new upstream

diff --git a/debian/patches/0001-Remove-support-for-the-selenium-driver.patch b/debian/patches/0001-Remove-support-for-the-selenium-driver.patch
index dabf134..5087207 100644
--- a/debian/patches/0001-Remove-support-for-the-selenium-driver.patch
+++ b/debian/patches/0001-Remove-support-for-the-selenium-driver.patch
@@ -6,14 +6,13 @@ Until ruby-selenium-webdriver lands in Debian, see
 <http://bugs.debian.org/703492>, we remove support for the :selenium driver.
 ---
  lib/capybara.rb |    4 ----
- metadata.yml    |   16 ----------------
- 2 files changed, 20 deletions(-)
+ 1 file changed, 4 deletions(-)
 
 diff --git a/lib/capybara.rb b/lib/capybara.rb
-index 74ca6c7..6158db8 100644
+index 5ec55ce..cb47a63 100644
 --- a/lib/capybara.rb
 +++ b/lib/capybara.rb
-@@ -357,7 +357,3 @@ end
+@@ -338,7 +338,3 @@ end
  Capybara.register_driver :rack_test do |app|
    Capybara::RackTest::Driver.new(app)
  end
@@ -21,30 +20,3 @@ index 74ca6c7..6158db8 100644
 -Capybara.register_driver :selenium do |app|
 -  Capybara::Selenium::Driver.new(app)
 -end
-diff --git a/metadata.yml b/metadata.yml
-index e5fac2c..3468f08 100644
---- a/metadata.yml
-+++ b/metadata.yml
-@@ -44,22 +44,6 @@ dependencies:
-       - !ruby/object:Gem::Version
-         version: '1.16'
- - !ruby/object:Gem::Dependency
--  name: selenium-webdriver
--  requirement: !ruby/object:Gem::Requirement
--    none: false
--    requirements:
--    - - ~>
--      - !ruby/object:Gem::Version
--        version: '2.0'
--  type: :runtime
--  prerelease: false
--  version_requirements: !ruby/object:Gem::Requirement
--    none: false
--    requirements:
--    - - ~>
--      - !ruby/object:Gem::Version
--        version: '2.0'
--- !ruby/object:Gem::Dependency
-   name: rack
-   requirement: !ruby/object:Gem::Requirement
-     none: false
diff --git a/debian/patches/0003-Inhibit-tests-that-needs-more-than-one-driver.patch b/debian/patches/0003-Inhibit-tests-that-needs-more-than-one-driver.patch
index cd12736..d74489d 100644
--- a/debian/patches/0003-Inhibit-tests-that-needs-more-than-one-driver.patch
+++ b/debian/patches/0003-Inhibit-tests-that-needs-more-than-one-driver.patch
@@ -9,10 +9,10 @@ As the :selenium driver is deactivated, there's only one driver left currently
  1 file changed, 2 insertions(+)
 
 diff --git a/spec/dsl_spec.rb b/spec/dsl_spec.rb
-index 7bb7a53..ff2eb9e 100644
+index cce248d..b4e6286 100644
 --- a/spec/dsl_spec.rb
 +++ b/spec/dsl_spec.rb
-@@ -156,12 +156,14 @@ describe Capybara::DSL do
+@@ -157,12 +157,14 @@ describe Capybara::DSL do
      end
  
      it "should change with the current driver" do

-- 
ruby-capybara.git