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

[Paul van Tilburg]

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

    Fixed the VERSION issue by adapting the 002get-version-from-right-path patch
    
    * debian/install: install the VERSION files to the libdir of haml so
        that Haml::Util.version works.
    * debian/patches:
       - 002get-version-from-right-path.patch: dropped, doesn't work if we
         also want to support Ruby 1.9.
       - 003fix-root-path.patch: added, fixes the root path so that
         Haml::Util.scope works properly.

diff --git a/debian/TODO b/debian/TODO
index d23932b..ed7f3af 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,6 +1,5 @@
 ruby-haml package ToDo
 ======================
 
-* Check and incorporate patches from the old libhaml-ruby package.
 * Prevent the Rakefile to removing ./REVISION when running `rake doc`.
 * Fix the test suite.
diff --git a/debian/changelog b/debian/changelog
index d6b81e6..4d57197 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,9 +25,16 @@ ruby-haml (3.1.4-1) UNRELEASED; urgency=low
   * debian/docs: install generated docs
   * debian/haml-elisp.NEWS: install a NEWS file to explain that the
       emacs modes have disappeared.
+  * debian/install: install the VERSION files to the libdir of haml so
+      that Haml::Util.version works.
   * 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/patches:
+     - 001fix-hardcoded-gem-path.patch:  dropped, this is now handled by
+       gem2deb.
+     - 002get-version-from-right-path.patch: dropped, doesn't work if we
+       also want to support Ruby 1.9.
+     - 003fix-root-path.patch: added, fixes the root path so that
+       Haml::Util.scope works properly.
   * debian/rules:
     - Call `rake doc` to generate documentation using yard.
     - Disable tests for now... it doesn't seem to work at all with our
@@ -35,7 +42,7 @@ ruby-haml (3.1.4-1) UNRELEASED; urgency=low
     - 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:11:08 +0100
+ -- Paul van Tilburg <paulvt at debian.org>  Fri, 16 Dec 2011 16:34:58 +0100
 
 libhaml-ruby (3.0.25-2) unstable; urgency=low
 
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..c9def05
--- /dev/null
+++ b/debian/install
@@ -0,0 +1 @@
+VERSION*        /usr/lib/ruby/vendor_ruby/haml
diff --git a/debian/patches/002get-version-from-right-path.patch b/debian/patches/002get-version-from-right-path.patch
deleted file mode 100644
index c86e083..0000000
--- a/debian/patches/002get-version-from-right-path.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-#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/003fix-root-path.patch b/debian/patches/003fix-root-path.patch
new file mode 100644
index 0000000..045d540
--- /dev/null
+++ b/debian/patches/003fix-root-path.patch
@@ -0,0 +1,27 @@
+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
+   # 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
+     def version
+       return @@version if defined?(@@version)
+ 
+-      numbers = File.read(scope('VERSION')).strip.split('.').
++      numbers = File.read(scope('haml/VERSION')).strip.split('.').
+         map {|n| n =~ /^[0-9]+$/ ? n.to_i : n}
+-      name = File.read(scope('VERSION_NAME')).strip
++      name = File.read(scope('haml/VERSION_NAME')).strip
+       @@version = {
+         :major => numbers[0],
+         :minor => numbers[1],
diff --git a/debian/patches/series b/debian/patches/series
index 4a03ae1..829da14 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-002get-version-from-right-path.patch
+003fix-root-path.patch

-- 
ruby-haml.git