[DRE-commits] [ruby-merb-haml] 04/09: adapted rspec_rubygems.patch remove an RSpec deprecation warning

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-merb-haml.

commit eab68462e66dfdab2d4d9f64e029f7c44ee0d8be
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Jul 9 07:17:44 2014 +0200

      adapted rspec_rubygems.patch remove an RSpec deprecation warning
---
 debian/changelog                    |  3 ++-
 debian/patches/rspec_rubygems.patch | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 250e863..a1232d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,8 @@ ruby-merb-haml (1.1.3-3) UNRELEASED; urgency=medium
     found without additional directory information (Closes: #747690)
   * Add haml4.patch to port merb-haml to version 4 of ruby-haml.
   * Remove single-debian-patch from local options, export the preexisting
-    debian patch to rspec_rubygems.patch
+    debian patch to rspec_rubygems.patch, adapted to remove an RSpec
+    deprecation warning
 
  -- Cédric Boutillier <boutil at debian.org>  Wed, 09 Jul 2014 06:48:12 +0200
 
diff --git a/debian/patches/rspec_rubygems.patch b/debian/patches/rspec_rubygems.patch
index 0ba592a..128f6e2 100644
--- a/debian/patches/rspec_rubygems.patch
+++ b/debian/patches/rspec_rubygems.patch
@@ -1,15 +1,15 @@
 Description: Do not use rubygems, use the new name rspec instead of spec
 Author: Tollef Fog Heen <tfheen at debian.org>
 
---- ruby-merb-haml-1.1.3.orig/spec/spec_helper.rb
-+++ ruby-merb-haml-1.1.3/spec/spec_helper.rb
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
 @@ -1,4 +1,4 @@
 -require "rubygems"
 +# require "rubygems"
  
  # Use current merb-core sources if running from a typical dev checkout.
  lib = File.expand_path('../../../merb-core/lib', __FILE__)
-@@ -9,7 +9,7 @@ require 'merb-core'
+@@ -9,7 +9,7 @@
  require "merb-haml"
  
  # Satisfies Autotest and anyone else not using the Rake tasks
@@ -18,11 +18,11 @@ Author: Tollef Fog Heen <tfheen at debian.org>
  
  # Shared spec files
  require "controllers/haml"
-@@ -18,6 +18,6 @@ Merb::Plugins.config[:haml] = { "autoclo
+@@ -18,6 +18,6 @@
  
  Merb.start :environment => 'test'
  
 -Spec::Runner.configure do |config|
-+RSpec::Runner.configure do |config|
++RSpec.configure do |config|
    config.include Merb::Test::RequestHelper  
  end

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