[DRE-commits] [SCM] ruby-haml.git branch, master, updated. debian/3.1.4-2-13-g96b4553

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit af5ebaa99d03aca6f5ac8283d0fe4f80fc2836e9
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Sun Jun 24 16:47:27 2012 +0200

    Add patch remove_require_rubygems.patch

diff --git a/debian/changelog b/debian/changelog
index 8e3cd8c..5632318 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,9 @@ ruby-haml (3.1.6-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * debian/control:
-    - Bump the build-depend on ruby-haml to 0.3.0. 
+    - Bumped the build-depend on ruby-haml to 0.3.0.
+  * debian/patches:
+    - Added remove_require_rubygems.patch.
 
  -- Paul van Tilburg <paulvt at debian.org>  Sun, 24 Jun 2012 16:28:09 +0200
 
diff --git a/debian/patches/remove_require_rubygems.patch b/debian/patches/remove_require_rubygems.patch
new file mode 100644
index 0000000..cf42732
--- /dev/null
+++ b/debian/patches/remove_require_rubygems.patch
@@ -0,0 +1,23 @@
+--- a/lib/haml/filters.rb
++++ b/lib/haml/filters.rb
+@@ -178,10 +178,6 @@
+   end
+ end
+ 
+-begin
+-  require 'rubygems'
+-rescue LoadError; end
+-
+ module Haml
+   module Filters
+     # Does not parse the filtered text.
+--- a/lib/haml/html.rb
++++ b/lib/haml/html.rb
+@@ -1,7 +1,6 @@
+ require File.dirname(__FILE__) + '/../haml'
+ 
+ require 'haml/engine'
+-require 'rubygems'
+ require 'cgi'
+ require 'hpricot'
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 829da14..01af81a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 003fix-root-path.patch
+remove_require_rubygems.patch

-- 
ruby-haml.git