[DRE-commits] [ruby-merb-haml] 03/09: Remove single-debian-patch from local options, export the preexisting debian patch to rspec_rubygems.patch

[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 37600bf1b843ea0c9c26b56500c5e8162595d51a
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Jul 9 07:13:33 2014 +0200

    Remove single-debian-patch from local options, export the preexisting debian patch to rspec_rubygems.patch
---
 debian/changelog                    |  2 ++
 debian/patches/rspec_rubygems.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series               |  2 +-
 debian/source/local-options         |  1 -
 spec/spec_helper.rb                 |  6 +++---
 5 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 906bff3..250e863 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ruby-merb-haml (1.1.3-3) UNRELEASED; urgency=medium
     It adds spec/ to the loadpath automatically and the spec_helper.rb file is
     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
 
  -- 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
new file mode 100644
index 0000000..0ba592a
--- /dev/null
+++ b/debian/patches/rspec_rubygems.patch
@@ -0,0 +1,28 @@
+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
+@@ -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'
+ require "merb-haml"
+ 
+ # Satisfies Autotest and anyone else not using the Rake tasks
+-require 'spec'
++require 'rspec'
+ 
+ # Shared spec files
+ require "controllers/haml"
+@@ -18,6 +18,6 @@ Merb::Plugins.config[:haml] = { "autoclo
+ 
+ Merb.start :environment => 'test'
+ 
+-Spec::Runner.configure do |config|
++RSpec::Runner.configure do |config|
+   config.include Merb::Test::RequestHelper  
+ end
diff --git a/debian/patches/series b/debian/patches/series
index 2bed9bc..32f9172 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-debian-changes
+rspec_rubygems.patch
 haml4.patch
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 7423a2d..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-single-debian-patch
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index aeb999d..769196d 100644
--- 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'
 require "merb-haml"
 
 # Satisfies Autotest and anyone else not using the Rake tasks
-require 'rspec'
+require 'spec'
 
 # Shared spec files
 require "controllers/haml"
@@ -18,6 +18,6 @@ Merb::Plugins.config[:haml] = { "autoclose" => ["foo"] }
 
 Merb.start :environment => 'test'
 
-RSpec::Runner.configure do |config|
+Spec::Runner.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