[DRE-commits] [SCM] ruby-googlecharts.git branch, master, updated. upstream/1.6.8-12-g3a5b63e

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit bdf502fadfe1a88cc36172dd563320bd6c41491e
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Tue May 8 15:46:44 2012 +0200

    add patches to remove rubygems stuff and $LOAD_PATH manipulation

diff --git a/debian/patches/avoid_load_path_manipulations.patch b/debian/patches/avoid_load_path_manipulations.patch
new file mode 100644
index 0000000..f700c00
--- /dev/null
+++ b/debian/patches/avoid_load_path_manipulations.patch
@@ -0,0 +1,11 @@
+Description: do not modify $LOAD_PATH when loading the library
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2011-05-08
+--- a/lib/gchart.rb
++++ b/lib/gchart.rb
+@@ -1,4 +1,4 @@
+-$:.unshift File.dirname(__FILE__)
++#$:.unshift File.dirname(__FILE__)
+ require 'gchart/version'
+ require 'gchart/theme'
+ require "net/http"
diff --git a/debian/patches/remove_rubygems_stuff.patch b/debian/patches/remove_rubygems_stuff.patch
new file mode 100644
index 0000000..7408248
--- /dev/null
+++ b/debian/patches/remove_rubygems_stuff.patch
@@ -0,0 +1,14 @@
+Description: Remove rubygems stuff from spec/spec_helper
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2011-05-08
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,7 +1 @@
+-begin
+-  require 'rspec'
+-rescue LoadError
+-  require 'rubygems'
+-  gem 'rspec'
+-  require 'rspec'
+-end
++require 'rspec'
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..11ba774
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+remove_rubygems_stuff.patch
+avoid_load_path_manipulations.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-googlecharts.git