[DRE-commits] [SCM] ruby-rspec-core.git branch, master, updated. debian/2.10.1-2-12-gfba549d

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit 37279ff40247b5c3ef54b02064d1927edb910366
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Tue Mar 26 09:08:14 2013 +0100

    Refresh Debian patches

diff --git a/debian/patches/disable-autotest-in-tests.patch b/debian/patches/disable-autotest-in-tests.patch
index 3fb01e7..59433ca 100644
--- a/debian/patches/disable-autotest-in-tests.patch
+++ b/debian/patches/disable-autotest-in-tests.patch
@@ -1,16 +1,16 @@
 Description: Disable autotest in tests
 Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
-Last-Update: 2012-02-13
+Last-Update: 2013-03-26
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
-@@ -16,7 +16,7 @@
+@@ -16,7 +16,7 @@ end
  
  Spork.prefork do
    require 'rspec/autorun'
 -  require 'autotest/rspec2'
 +#  require 'autotest/rspec2'
    require 'aruba/api'
-   require 'fakefs/spec_helpers'
  
+   if RUBY_PLATFORM == 'java'
diff --git a/debian/patches/remove-aruba-stuff-in-tests.patch b/debian/patches/remove-aruba-stuff-in-tests.patch
index 69de1a9..50c2e27 100644
--- a/debian/patches/remove-aruba-stuff-in-tests.patch
+++ b/debian/patches/remove-aruba-stuff-in-tests.patch
@@ -3,30 +3,30 @@ Description: remove use of aruba in spec_helper.rb
  essential for the test suite, anything related to Aruba is commented out in
  spec_helper.rb.
 Author: Cédric Boutillier <cedric.boutillier at gmail.com>
-Last-Update: 2012-02-13
+Last-Update: 2013-03-26
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
-@@ -17,7 +17,7 @@
+@@ -17,7 +17,7 @@ end
  Spork.prefork do
    require 'rspec/autorun'
  #  require 'autotest/rspec2'
 -  require 'aruba/api'
 +#  require 'aruba/api'
-   require 'fakefs/spec_helpers'
  
-   Dir['./spec/support/**/*.rb'].map {|f| require f}
-@@ -71,9 +71,9 @@
-     c.alias_it_should_behave_like_to 'it_has_behavior'
+   if RUBY_PLATFORM == 'java'
+     # Works around https://jira.codehaus.org/browse/JRUBY-5678
+@@ -101,9 +101,9 @@ Spork.prefork do
+     c.alias_it_behaves_like_to 'it_has_behavior'
      c.around {|example| sandboxed { example.run }}
      c.include(RSpecHelpers)
 -    c.include Aruba::Api, :example_group => {
 -      :file_path => /spec\/command_line/
 -    }
-+    #c.include Aruba::Api, :example_group => {
-+    #  :file_path => /spec\/command_line/
-+    #}
++#    c.include Aruba::Api, :example_group => {
++#      :file_path => /spec\/command_line/
++#    }
  
-     # runtime options
-     c.treat_symbols_as_metadata_keys_with_true_values = true
+     c.expect_with :rspec do |expectations|
+       expectations.syntax = :expect
diff --git a/debian/patches/remove-rubygems-stuff-in-tests.patch b/debian/patches/remove-rubygems-stuff-in-tests.patch
index 16417fc..35cb7d1 100644
--- a/debian/patches/remove-rubygems-stuff-in-tests.patch
+++ b/debian/patches/remove-rubygems-stuff-in-tests.patch
@@ -1,6 +1,6 @@
 Description: remove requirement on rubygems in spec_helper.rb
 Author: Cédric Boutillier <cedric.boutillier at gmail.com>
-Last-Update: 2012-02-13
+Last-Update: 2013-03-26
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/spec/spec_helper.rb

-- 
ruby-rspec-core.git