[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 ddd8054ef96d0b63ed9d6a33a4a9e82dec172bec
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Fri Dec 16 16:05:13 2011 +0100

    debian/patches/001fix-hardcoded-gem-path.patch: dropped, this is now handled by gem2deb

diff --git a/debian/changelog b/debian/changelog
index 3ca1b00..c013d85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ ruby-haml (3.1.4-1) UNRELEASED; urgency=low
   * debian/haml-elisp.NEWS: install a NEWS file to explain that the
       emacs modes have disappeared.
   * debian/manpages: install manpages debian/html2haml.1 and debian/haml.1. 
+  * debian/patches/001fix-hardcoded-gem-path.patch: dropped, this is now
+     handled by gem2deb
   * debian/rules:
     - Call `rake doc` to generate documentation using yard.
     - Disable tests for now... it doesn't seem to work at all with our
@@ -33,7 +35,7 @@ ruby-haml (3.1.4-1) UNRELEASED; urgency=low
     - Remove the installed sass.rb dummy library that loads Sass via
       a gem/from the vendor dir.
 
- -- Paul van Tilburg <paulvt at debian.org>  Fri, 16 Dec 2011 15:53:11 +0100
+ -- Paul van Tilburg <paulvt at debian.org>  Fri, 16 Dec 2011 16:04:23 +0100
 
 libhaml-ruby (3.0.25-2) unstable; urgency=low
 
diff --git a/debian/patches/002get-version-from-right-path.patch b/debian/patches/002get-version-from-right-path.patch
new file mode 100644
index 0000000..c86e083
--- /dev/null
+++ b/debian/patches/002get-version-from-right-path.patch
@@ -0,0 +1,18 @@
+#This patch is for adding ruby1.8
+Index: libhaml-ruby-3.0.4/lib/haml/version.rb
+===================================================================
+--- libhaml-ruby-3.0.4.orig/lib/haml/version.rb	2010-05-16 15:03:57.000000000 -0400
++++ libhaml-ruby-3.0.4/lib/haml/version.rb	2010-05-16 15:05:33.000000000 -0400
+@@ -41,10 +41,9 @@
+     # @return [{Symbol => String/Fixnum}] The version hash
+     def version
+       return @@version if defined?(@@version)
+-
+-      numbers = File.read(scope('VERSION')).strip.split('.').
++      numbers = File.read('/usr/lib/ruby/1.8/haml/VERSION').strip.split('.').
+         map {|n| n =~ /^[0-9]+$/ ? n.to_i : n}
+-      name = File.read(scope('VERSION_NAME')).strip
++      name = File.read('/usr/lib/ruby/1.8/haml/VERSION_NAME').strip
+       @@version = {
+         :major => numbers[0],
+         :minor => numbers[1],
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4a03ae1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+002get-version-from-right-path.patch

-- 
ruby-haml.git