[DRE-commits] [SCM] ruby-fssm.git branch, master, updated. upstream/0.2.9-10-g8b256d3

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit c51ecea7f37209cbb1181361ced0a3a2ebbb9ba0
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Tue May 15 23:13:26 2012 +0200

    Add remove_rubygems_bundler_stuff_from_spec.patch
    
      + rubygems and bundler do not need to be required

diff --git a/debian/patches/remove_rubygems_bundler_stuff_from_spec.patch b/debian/patches/remove_rubygems_bundler_stuff_from_spec.patch
new file mode 100644
index 0000000..289a666
--- /dev/null
+++ b/debian/patches/remove_rubygems_bundler_stuff_from_spec.patch
@@ -0,0 +1,23 @@
+Description: Remove bundler/rubygems require statement from the specs
+ These are not needed since all the libraries are in Debian
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Forwarded: not-needed
+Last-Update: 2012-05-15
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,8 +1,8 @@
+-$LOAD_PATH.unshift(File.dirname(__FILE__))
+-$LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
+-
+-require 'rubygems'
+-require 'bundler/setup'
++#$LOAD_PATH.unshift(File.dirname(__FILE__))
++#$LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
++#
++#require 'rubygems'
++#require 'bundler/setup'
+ require 'fssm'
+ 
+ require 'rspec'
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e5d48e4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+remove_rubygems_bundler_stuff_from_spec.patch
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..4aceb10
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1 @@
+unapply-patches

-- 
ruby-fssm.git