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

[Gunnar Wolf]

The following commit has been merged in the master branch:
commit 9d2f0c5352b75da3ff5adcc02d47061ef681e711
Author: Gunnar Wolf <gwolf at debian.org>
Date:   Sun Dec 18 07:59:15 2011 -0600

    Separate the $LOAD_PATH modification from the require call in html2haml

diff --git a/debian/changelog b/debian/changelog
index fad483f..d338407 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,8 +45,10 @@ ruby-haml (3.1.4-1) unstable; urgency=low
 
   [ Gunnar Wolf ]
   * Added myself to uploaders
+  * Separate the $LOAD_PATH modification from the require call in
+    html2haml
 
- -- Gunnar Wolf <gwolf at debian.org>  Sun, 18 Dec 2011 07:32:15 -0600
+ -- Gunnar Wolf <gwolf at debian.org>  Sun, 18 Dec 2011 07:56:44 -0600
 
 libhaml-ruby (3.0.25-2) unstable; urgency=low
 
diff --git a/debian/patches/003fix-root-path.patch b/debian/patches/003fix-root-path.patch
index 045d540..50e4515 100644
--- a/debian/patches/003fix-root-path.patch
+++ b/debian/patches/003fix-root-path.patch
@@ -1,19 +1,19 @@
-diff --git a/lib/haml/root.rb b/lib/haml/root.rb
-index a7678be..28d339a 100644
---- a/lib/haml/root.rb
-+++ b/lib/haml/root.rb
-@@ -3,5 +3,5 @@ module Haml
+Index: ruby-haml/lib/haml/root.rb
+===================================================================
+--- ruby-haml.orig/lib/haml/root.rb	2011-12-18 07:56:53.000000000 -0600
++++ ruby-haml/lib/haml/root.rb	2011-12-18 07:57:43.000000000 -0600
+@@ -3,5 +3,5 @@
    # This may be overridden by the package manager
    # if the lib directory is separated from the main source tree.
    # @api public
 -  ROOT_DIR = File.expand_path(File.join(__FILE__, "../../.."))
 +  ROOT_DIR = File.expand_path(File.join(__FILE__, "../.."))
  end
-diff --git a/lib/haml/version.rb b/lib/haml/version.rb
-index bd58c23..4ede446 100644
---- a/lib/haml/version.rb
-+++ b/lib/haml/version.rb
-@@ -42,9 +42,9 @@ module Haml
+Index: ruby-haml/lib/haml/version.rb
+===================================================================
+--- ruby-haml.orig/lib/haml/version.rb	2011-12-18 07:56:53.000000000 -0600
++++ ruby-haml/lib/haml/version.rb	2011-12-18 07:57:43.000000000 -0600
+@@ -42,9 +42,9 @@
      def version
        return @@version if defined?(@@version)
  
@@ -25,3 +25,16 @@ index bd58c23..4ede446 100644
        @@version = {
          :major => numbers[0],
          :minor => numbers[1],
+Index: ruby-haml/bin/html2haml
+===================================================================
+--- ruby-haml.orig/bin/html2haml	2011-12-18 07:57:37.000000000 -0600
++++ ruby-haml/bin/html2haml	2011-12-18 07:58:16.000000000 -0600
+@@ -1,6 +1,7 @@
+ #!/usr/bin/env ruby
+ 
+-require File.dirname(__FILE__) + '/../lib/haml'
++$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
++require 'haml'
+ require 'haml/exec'
+ 
+ opts = Haml::Exec::HTML2Haml.new(ARGV)

-- 
ruby-haml.git