[DRE-commits] [SCM] ruby-haml.git branch, master, updated. upstream/3.1.4-8-gbe9aa5d

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit be9aa5d30fcd01240731115e1dc55170488c6739
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Fri Dec 16 16:11:44 2011 +0100

    Remove the installed sass.rb and plugin/sass.rb dummy libraries that tries to load Sass via a gem/from the vendor dir.

diff --git a/debian/changelog b/debian/changelog
index c013d85..d6b81e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,10 +32,10 @@ ruby-haml (3.1.4-1) UNRELEASED; urgency=low
     - Call `rake doc` to generate documentation using yard.
     - Disable tests for now... it doesn't seem to work at all with our
       Rails 2.0 setup.
-    - Remove the installed sass.rb dummy library that loads Sass via
-      a gem/from the vendor dir.
+    - Remove the installed sass.rb and plugin/sass.rb dummy libraries that
+      tries to load Sass via a gem/from the vendor dir.
 
- -- Paul van Tilburg <paulvt at debian.org>  Fri, 16 Dec 2011 16:04:23 +0100
+ -- Paul van Tilburg <paulvt at debian.org>  Fri, 16 Dec 2011 16:11:08 +0100
 
 libhaml-ruby (3.0.25-2) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index e68ba45..967b63e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,7 @@ override_dh_auto_install:
 	dh_auto_install
 	# Sass is installed via ruby-sass and not mandatory anyway.
 	rm debian/ruby-haml/usr/lib/ruby/vendor_ruby/sass.rb
+	rm debian/ruby-haml/usr/lib/ruby/vendor_ruby/sass/plugin.rb
 
 override_dh_auto_clean:
 	dh_auto_clean

-- 
ruby-haml.git