[DRE-commits] r5323 - trunk/libhaml-ruby/debian/patches
Deepak Tripathi
deepak-guest at alioth.debian.org
Fri May 14 09:45:30 UTC 2010
Author: deepak-guest
Date: 2010-05-14 09:45:21 +0000 (Fri, 14 May 2010)
New Revision: 5323
Added:
trunk/libhaml-ruby/debian/patches/001fix-hardcoded-gem-path.patch
trunk/libhaml-ruby/debian/patches/002get-version-from-right-path.patch
Removed:
trunk/libhaml-ruby/debian/patches/fix-hardcoded-gem-paths
trunk/libhaml-ruby/debian/patches/get-version-from-right-path
Modified:
trunk/libhaml-ruby/debian/patches/series
Log:
Created patch for valid path and gem path
Added: trunk/libhaml-ruby/debian/patches/001fix-hardcoded-gem-path.patch
===================================================================
--- trunk/libhaml-ruby/debian/patches/001fix-hardcoded-gem-path.patch (rev 0)
+++ trunk/libhaml-ruby/debian/patches/001fix-hardcoded-gem-path.patch 2010-05-14 09:45:21 UTC (rev 5323)
@@ -0,0 +1,58 @@
+#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
+===================================================================
+--- libhaml-ruby-3.0.3.orig/bin/css2sass 2010-05-14 14:51:59.000000000 -0400
++++ libhaml-ruby-3.0.3/bin/css2sass 2010-05-14 14:52:49.000000000 -0400
+@@ -1,6 +1,6 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/ruby1.8
+
+-require File.dirname(__FILE__) + '/../lib/haml'
++require 'haml'
+ require 'haml/exec'
+
+ warn <<END
+Index: libhaml-ruby-3.0.3/bin/haml
+===================================================================
+--- libhaml-ruby-3.0.3.orig/bin/haml 2010-05-14 14:53:01.000000000 -0400
++++ libhaml-ruby-3.0.3/bin/haml 2010-05-14 14:53:30.000000000 -0400
+@@ -1,7 +1,6 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/ruby1.8
+ # The command line Haml parser.
+
+-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+ require 'haml'
+ require 'haml/exec'
+
+Index: libhaml-ruby-3.0.3/bin/html2haml
+===================================================================
+--- libhaml-ruby-3.0.3.orig/bin/html2haml 2010-05-14 14:53:44.000000000 -0400
++++ libhaml-ruby-3.0.3/bin/html2haml 2010-05-14 14:54:20.000000000 -0400
+@@ -1,6 +1,6 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/ruby1.8
+
+-require File.dirname(__FILE__) + '/../lib/haml'
++require 'haml'
+ require 'haml/exec'
+
+ opts = Haml::Exec::HTML2Haml.new(ARGV)
+Index: libhaml-ruby-3.0.3/bin/sass
+===================================================================
+--- libhaml-ruby-3.0.3.orig/bin/sass 2010-05-14 14:54:30.000000000 -0400
++++ libhaml-ruby-3.0.3/bin/sass 2010-05-14 14:54:47.000000000 -0400
+@@ -1,7 +1,7 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/ruby1.8
+ # The command line Sass parser.
+
+-require File.dirname(__FILE__) + '/../lib/haml'
++require 'haml'
+ require 'haml/exec'
+
+ opts = Haml::Exec::Sass.new(ARGV)
Added: trunk/libhaml-ruby/debian/patches/002get-version-from-right-path.patch
===================================================================
--- trunk/libhaml-ruby/debian/patches/002get-version-from-right-path.patch (rev 0)
+++ trunk/libhaml-ruby/debian/patches/002get-version-from-right-path.patch 2010-05-14 09:45:21 UTC (rev 5323)
@@ -0,0 +1,17 @@
+Index: libhaml-ruby-3.0.3/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
+@@ -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],
Deleted: trunk/libhaml-ruby/debian/patches/fix-hardcoded-gem-paths
===================================================================
--- trunk/libhaml-ruby/debian/patches/fix-hardcoded-gem-paths 2010-05-14 08:58:40 UTC (rev 5322)
+++ trunk/libhaml-ruby/debian/patches/fix-hardcoded-gem-paths 2010-05-14 09:45:21 UTC (rev 5323)
@@ -1,58 +0,0 @@
-# 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-2.2.0/bin/css2sass
-===================================================================
---- libhaml-ruby-2.2.0.orig/bin/css2sass 2009-07-06 16:54:29.000000000 -0500
-+++ libhaml-ruby-2.2.0/bin/css2sass 2009-07-06 16:55:18.000000000 -0500
-@@ -1,6 +1,6 @@
--#!/usr/bin/env ruby
-+#! /usr/bin/ruby1.8
-
--require File.dirname(__FILE__) + '/../lib/haml'
-+require 'haml'
- require 'haml/exec'
-
- opts = Haml::Exec::CSS2Sass.new(ARGV)
-Index: libhaml-ruby-2.2.0/bin/haml
-===================================================================
---- libhaml-ruby-2.2.0.orig/bin/haml 2009-07-06 16:54:28.000000000 -0500
-+++ libhaml-ruby-2.2.0/bin/haml 2009-07-06 16:55:18.000000000 -0500
-@@ -1,7 +1,6 @@
--#!/usr/bin/env ruby
-+#! /usr/bin/ruby1.8
- # The command line Haml parser.
-
--$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
- require 'haml'
- require 'haml/exec'
-
-Index: libhaml-ruby-2.2.0/bin/html2haml
-===================================================================
---- libhaml-ruby-2.2.0.orig/bin/html2haml 2009-07-06 16:54:29.000000000 -0500
-+++ libhaml-ruby-2.2.0/bin/html2haml 2009-07-06 16:55:18.000000000 -0500
-@@ -1,6 +1,6 @@
--#!/usr/bin/env ruby
-+#! /usr/bin/ruby1.8
-
--require File.dirname(__FILE__) + '/../lib/haml'
-+require 'haml'
- require 'haml/exec'
-
- opts = Haml::Exec::HTML2Haml.new(ARGV)
-Index: libhaml-ruby-2.2.0/bin/sass
-===================================================================
---- libhaml-ruby-2.2.0.orig/bin/sass 2009-07-06 16:54:28.000000000 -0500
-+++ libhaml-ruby-2.2.0/bin/sass 2009-07-06 16:55:18.000000000 -0500
-@@ -1,7 +1,7 @@
--#!/usr/bin/env ruby
-+#! /usr/bin/ruby1.8
- # The command line Sass parser.
-
--require File.dirname(__FILE__) + '/../lib/haml'
-+require 'haml'
- require 'haml/exec'
-
- opts = Haml::Exec::Sass.new(ARGV)
Deleted: trunk/libhaml-ruby/debian/patches/get-version-from-right-path
===================================================================
--- trunk/libhaml-ruby/debian/patches/get-version-from-right-path 2010-05-14 08:58:40 UTC (rev 5322)
+++ trunk/libhaml-ruby/debian/patches/get-version-from-right-path 2010-05-14 09:45:21 UTC (rev 5323)
@@ -1,18 +0,0 @@
-# Upstream has defined that, at initialization, the version number should
-# be retrieved from the path this would be installed... Were it to be installed
-# as a Gem :-/ Fix that... In a somewhat dirty way, but still.
-Index: libhaml-ruby-2.2.0/lib/haml/version.rb
-===================================================================
---- libhaml-ruby-2.2.0.orig/lib/haml/version.rb 2009-07-06 16:56:34.000000000 -0500
-+++ libhaml-ruby-2.2.0/lib/haml/version.rb 2009-07-06 16:56:57.000000000 -0500
-@@ -27,8 +27,8 @@
- def version
- return @@version if defined?(@@version)
-
-- numbers = File.read(scope('VERSION')).strip.split('.').map { |n| n.to_i }
-- name = File.read(scope('VERSION_NAME')).strip
-+ numbers = File.read('/usr/lib/ruby/1.8/haml/VERSION').strip.split('.').map { |n| n.to_i }
-+ name = File.read('/usr/lib/ruby/1.8/haml/VERSION_NAME').strip
- @@version = {
- :major => numbers[0],
- :minor => numbers[1],
Modified: trunk/libhaml-ruby/debian/patches/series
===================================================================
--- trunk/libhaml-ruby/debian/patches/series 2010-05-14 08:58:40 UTC (rev 5322)
+++ trunk/libhaml-ruby/debian/patches/series 2010-05-14 09:45:21 UTC (rev 5323)
@@ -1,2 +1,2 @@
-fix-hardcoded-gem-paths
-get-version-from-right-path
+001fix-hardcoded-gem-path.patch
+002get-version-from-right-path.patch
More information about the Pkg-ruby-extras-commits
mailing list