[DRE-commits] r5342 - trunk/libhaml-ruby/debian/patches

[Deepak Tripathi]

Author: deepak-guest
Date: 2010-05-16 09:42:42 +0000 (Sun, 16 May 2010)
New Revision: 5342

Modified:
   trunk/libhaml-ruby/debian/patches/001fix-hardcoded-gem-path.patch
   trunk/libhaml-ruby/debian/patches/002get-version-from-right-path.patch
Log:
Patch updated for new upstream changes

Modified: trunk/libhaml-ruby/debian/patches/001fix-hardcoded-gem-path.patch
===================================================================
--- trunk/libhaml-ruby/debian/patches/001fix-hardcoded-gem-path.patch	2010-05-16 09:10:21 UTC (rev 5341)
+++ trunk/libhaml-ruby/debian/patches/001fix-hardcoded-gem-path.patch	2010-05-16 09:42:42 UTC (rev 5342)
@@ -1,12 +1,7 @@
-#The generated binaries include references to the location where the
-#Haml library should be located... If it was installed as a Gem.
-#
-#Besides this, this patch also collects the changes auto-made by
-#setup.rb to the actual interpreter (/usr/bin/ruby1.8)
-Index: libhaml-ruby-3.0.3/bin/css2sass
+Index: libhaml-ruby-3.0.4/bin/css2sass
 ===================================================================
---- libhaml-ruby-3.0.3.orig/bin/css2sass	2010-05-14 15:47:17.000000000 -0400
-+++ libhaml-ruby-3.0.3/bin/css2sass	2010-05-14 15:47:26.000000000 -0400
+--- libhaml-ruby-3.0.4.orig/bin/css2sass	2010-05-16 14:58:21.000000000 -0400
++++ libhaml-ruby-3.0.4/bin/css2sass	2010-05-16 14:59:14.000000000 -0400
 @@ -1,6 +1,6 @@
 -#!/usr/bin/env ruby
 +#!/usr/bin/ruby1.8
@@ -16,10 +11,10 @@
  require 'haml/exec'
  
  warn <<END
-Index: libhaml-ruby-3.0.3/bin/haml
+Index: libhaml-ruby-3.0.4/bin/haml
 ===================================================================
---- libhaml-ruby-3.0.3.orig/bin/haml	2010-05-14 15:47:17.000000000 -0400
-+++ libhaml-ruby-3.0.3/bin/haml	2010-05-14 15:47:26.000000000 -0400
+--- libhaml-ruby-3.0.4.orig/bin/haml	2010-05-16 14:59:30.000000000 -0400
++++ libhaml-ruby-3.0.4/bin/haml	2010-05-16 14:59:55.000000000 -0400
 @@ -1,7 +1,6 @@
 -#!/usr/bin/env ruby
 +#!/usr/bin/ruby1.8
@@ -29,10 +24,10 @@
  require 'haml'
  require 'haml/exec'
  
-Index: libhaml-ruby-3.0.3/bin/html2haml
+Index: libhaml-ruby-3.0.4/bin/html2haml
 ===================================================================
---- libhaml-ruby-3.0.3.orig/bin/html2haml	2010-05-14 15:47:17.000000000 -0400
-+++ libhaml-ruby-3.0.3/bin/html2haml	2010-05-14 15:47:26.000000000 -0400
+--- libhaml-ruby-3.0.4.orig/bin/html2haml	2010-05-16 15:00:06.000000000 -0400
++++ libhaml-ruby-3.0.4/bin/html2haml	2010-05-16 15:00:24.000000000 -0400
 @@ -1,6 +1,6 @@
 -#!/usr/bin/env ruby
 +#!/usr/bin/ruby1.8
@@ -42,10 +37,10 @@
  require 'haml/exec'
  
  opts = Haml::Exec::HTML2Haml.new(ARGV)
-Index: libhaml-ruby-3.0.3/bin/sass
+Index: libhaml-ruby-3.0.4/bin/sass
 ===================================================================
---- libhaml-ruby-3.0.3.orig/bin/sass	2010-05-14 15:47:17.000000000 -0400
-+++ libhaml-ruby-3.0.3/bin/sass	2010-05-14 15:47:26.000000000 -0400
+--- libhaml-ruby-3.0.4.orig/bin/sass	2010-05-16 15:00:38.000000000 -0400
++++ libhaml-ruby-3.0.4/bin/sass	2010-05-16 15:00:55.000000000 -0400
 @@ -1,7 +1,7 @@
 -#!/usr/bin/env ruby
 +#!/usr/bin/ruby1.8
@@ -56,12 +51,13 @@
  require 'haml/exec'
  
  opts = Haml::Exec::Sass.new(ARGV)
-Index: libhaml-ruby-3.0.3/bin/sass-convert
+Index: libhaml-ruby-3.0.4/bin/sass-convert
 ===================================================================
---- libhaml-ruby-3.0.3.orig/bin/sass-convert	2010-05-14 15:47:33.000000000 -0400
-+++ libhaml-ruby-3.0.3/bin/sass-convert	2010-05-14 15:47:47.000000000 -0400
+--- libhaml-ruby-3.0.4.orig/bin/sass-convert	2010-05-16 15:01:02.000000000 -0400
++++ libhaml-ruby-3.0.4/bin/sass-convert	2010-05-16 15:01:19.000000000 -0400
 @@ -1,6 +1,6 @@
- #! /usr/bin/ruby1.8
+-#!/usr/bin/env ruby
++#!/usr/bin/ruby1.8
  
 -require File.dirname(__FILE__) + '/../lib/haml'
 +require 'haml'

Modified: trunk/libhaml-ruby/debian/patches/002get-version-from-right-path.patch
===================================================================
--- trunk/libhaml-ruby/debian/patches/002get-version-from-right-path.patch	2010-05-16 09:10:21 UTC (rev 5341)
+++ trunk/libhaml-ruby/debian/patches/002get-version-from-right-path.patch	2010-05-16 09:42:42 UTC (rev 5342)
@@ -1,7 +1,7 @@
-Index: libhaml-ruby-3.0.3/lib/haml/version.rb
+Index: libhaml-ruby-3.0.4/lib/haml/version.rb
 ===================================================================
---- libhaml-ruby-3.0.3.orig/lib/haml/version.rb	2010-05-14 15:00:02.000000000 -0400
-+++ libhaml-ruby-3.0.3/lib/haml/version.rb	2010-05-14 15:02:36.000000000 -0400
+--- 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