[DRE-commits] r3131 - packages-wip/libhaml-ruby/trunk/debian/patches

[gwolf at alioth.debian.org]

Author: gwolf
Date: 2008-12-19 01:50:22 +0000 (Fri, 19 Dec 2008)
New Revision: 3131

Removed:
   packages-wip/libhaml-ruby/trunk/debian/patches/fix-hardcoded-gem-paths.patch
   packages-wip/libhaml-ruby/trunk/debian/patches/get-version-from-right-path.patch
Log:
Discarded duplicated patches


Deleted: packages-wip/libhaml-ruby/trunk/debian/patches/fix-hardcoded-gem-paths.patch
===================================================================
--- packages-wip/libhaml-ruby/trunk/debian/patches/fix-hardcoded-gem-paths.patch	2008-12-19 01:48:21 UTC (rev 3130)
+++ packages-wip/libhaml-ruby/trunk/debian/patches/fix-hardcoded-gem-paths.patch	2008-12-19 01:50:22 UTC (rev 3131)
@@ -1,47 +0,0 @@
-# The generated binaries include references to the location where the
-# Haml library should be located... If it was installed as a Gem.
-diff -Nur -x '*.orig' -x '*~' libhaml-ruby-2.0.6/bin/css2sass libhaml-ruby-2.0.6.new/bin/css2sass
---- libhaml-ruby-2.0.6/bin/css2sass	2008-12-18 18:24:08.000000000 -0600
-+++ libhaml-ruby-2.0.6.new/bin/css2sass	2008-12-18 19:18:30.000000000 -0600
-@@ -1,6 +1,6 @@
- #! /usr/bin/ruby1.8
- 
--require File.dirname(__FILE__) + '/../lib/haml'
-+require 'haml'
- require 'haml/exec'
- 
- opts = Haml::Exec::CSS2Sass.new(ARGV)
-diff -Nur -x '*.orig' -x '*~' libhaml-ruby-2.0.6/bin/haml libhaml-ruby-2.0.6.new/bin/haml
---- libhaml-ruby-2.0.6/bin/haml	2008-12-18 18:24:08.000000000 -0600
-+++ libhaml-ruby-2.0.6.new/bin/haml	2008-12-18 19:18:22.000000000 -0600
-@@ -1,7 +1,6 @@
- #! /usr/bin/ruby1.8
- # The command line Haml parser.
- 
--$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
- require 'haml'
- require 'haml/exec'
- 
-diff -Nur -x '*.orig' -x '*~' libhaml-ruby-2.0.6/bin/html2haml libhaml-ruby-2.0.6.new/bin/html2haml
---- libhaml-ruby-2.0.6/bin/html2haml	2008-12-18 18:24:08.000000000 -0600
-+++ libhaml-ruby-2.0.6.new/bin/html2haml	2008-12-18 19:18:02.000000000 -0600
-@@ -1,6 +1,6 @@
- #! /usr/bin/ruby1.8
- 
--require File.dirname(__FILE__) + '/../lib/haml'
-+require 'haml'
- require 'haml/exec'
- 
- opts = Haml::Exec::HTML2Haml.new(ARGV)
-diff -Nur -x '*.orig' -x '*~' libhaml-ruby-2.0.6/bin/sass libhaml-ruby-2.0.6.new/bin/sass
---- libhaml-ruby-2.0.6/bin/sass	2008-12-18 18:24:08.000000000 -0600
-+++ libhaml-ruby-2.0.6.new/bin/sass	2008-12-18 19:17:54.000000000 -0600
-@@ -1,7 +1,7 @@
- #! /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: packages-wip/libhaml-ruby/trunk/debian/patches/get-version-from-right-path.patch
===================================================================
--- packages-wip/libhaml-ruby/trunk/debian/patches/get-version-from-right-path.patch	2008-12-19 01:48:21 UTC (rev 3130)
+++ packages-wip/libhaml-ruby/trunk/debian/patches/get-version-from-right-path.patch	2008-12-19 01:50:22 UTC (rev 3131)
@@ -1,15 +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.
-diff -Nur -x '*.orig' -x '*~' libhaml-ruby-2.0.6/lib/haml.rb libhaml-ruby-2.0.6.new/lib/haml.rb
---- libhaml-ruby-2.0.6/lib/haml.rb	2008-12-18 19:13:30.000000000 -0600
-+++ libhaml-ruby-2.0.6.new/lib/haml.rb	2008-12-18 19:14:03.000000000 -0600
-@@ -1002,7 +1002,7 @@
-   def self.version
-     return @@version if defined?(@@version)
- 
--    numbers = File.read(scope('VERSION')).strip.split('.').map { |n| n.to_i }
-+    numbers = File.read('/usr/lib/ruby/1.8/haml/VERSION').strip.split('.').map { |n| n.to_i }
-     @@version = {
-       :major => numbers[0],
-       :minor => numbers[1],