[DRE-commits] [SCM] ruby-html2haml.git branch, master, updated. upstream/1.0.1-5-g9b6db54

[Gunnar Wolf]

The following commit has been merged in the master branch:
commit 3643d4ccd4c8af6fca55e74dc4eab2ff710a3ed4
Author: Gunnar Wolf <gwolf at gwolf.org>
Date:   Thu May 23 17:20:53 2013 -0500

    Skip Bundler, Rubygems calls

diff --git a/debian/patches/fix_test_path b/debian/patches/fix_test_path
index 44d7c52..cf61c70 100644
--- a/debian/patches/fix_test_path
+++ b/debian/patches/fix_test_path
@@ -1,8 +1,7 @@
-Description: Explicitly declare 'test' in the tests' search path
 Author: Gunnar Wolf <gwolf at debian.org>
-Bug-Debian: http://bugs.debian.org/709507
 Forwarded: not-needed
 Last-Update: 2013-05-23
+Description: Explicitly declare 'test' in the tests' search path
 
 --- ruby-html2haml-1.0.1.orig/test/html2haml_test.rb
 +++ ruby-html2haml-1.0.1/test/html2haml_test.rb
diff --git a/debian/patches/no_rubygems_nor_bundler b/debian/patches/no_rubygems_nor_bundler
new file mode 100644
index 0000000..897ddfd
--- /dev/null
+++ b/debian/patches/no_rubygems_nor_bundler
@@ -0,0 +1,35 @@
+Author: Gunnar Wolf <gwolf at debian.org>
+Forwarded: not-needed
+Last-Update: 2013-05-23
+Description: Skip the 'rubygems' and 'bundler' calls
+
+Index: ruby-html2haml/lib/html2haml.rb
+===================================================================
+--- ruby-html2haml.orig/lib/html2haml.rb	2013-05-23 17:20:12.000000000 -0500
++++ ruby-html2haml/lib/html2haml.rb	2013-05-23 17:20:35.000000000 -0500
+@@ -1,5 +1,6 @@
+-require "rubygems"
+-gem "haml", ">= 3.2"
++# require "rubygems"
++#gem "haml", ">= 3.2"
++require 'haml'
+ require File.expand_path("../html2haml/version", __FILE__)
+ require "haml/util"
+ require "haml/parser"
+Index: ruby-html2haml/test/test_helper.rb
+===================================================================
+--- ruby-html2haml.orig/test/test_helper.rb	2013-05-23 17:20:12.000000000 -0500
++++ ruby-html2haml/test/test_helper.rb	2013-05-23 17:20:12.000000000 -0500
+@@ -1,10 +1,10 @@
+-require "rubygems"
++# require "rubygems"
+ if ENV["COVERAGE"]
+   require "simplecov"
+   SimpleCov.start
+ end
+ 
+-require "bundler/setup"
++# require "bundler/setup"
+ require "minitest/autorun"
+ require "html2haml"
+ require 'html2haml/html'
diff --git a/debian/patches/series b/debian/patches/series
index a2958e4..a1dfb1a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+no_rubygems_nor_bundler
 fix_test_path

-- 
ruby-html2haml.git