[DRE-commits] r4913 - trunk/libcompass-ruby/debian/patches

[Micah Anderson]

Author: micah
Date: 2010-03-06 21:23:34 +0000 (Sat, 06 Mar 2010)
New Revision: 4913

Modified:
   trunk/libcompass-ruby/debian/patches/fix-binary-load-path
   trunk/libcompass-ruby/debian/patches/get-version-from-right-place
Log:
lets not hardcode the ruby version and instead pull some wacky stuff

Modified: trunk/libcompass-ruby/debian/patches/fix-binary-load-path
===================================================================
--- trunk/libcompass-ruby/debian/patches/fix-binary-load-path	2010-03-06 20:57:41 UTC (rev 4912)
+++ trunk/libcompass-ruby/debian/patches/fix-binary-load-path	2010-03-06 21:23:34 UTC (rev 4913)
@@ -1,15 +1,15 @@
 Index: libcompass-ruby-0.8.5debian/bin/compass
 ===================================================================
 --- libcompass-ruby-0.8.5debian.orig/bin/compass	2009-07-07 00:50:23.000000000 -0400
-+++ libcompass-ruby-0.8.5debian/bin/compass	2010-03-06 15:56:49.000000000 -0500
++++ libcompass-ruby-0.8.5debian/bin/compass	2010-03-06 16:22:15.000000000 -0500
 @@ -1,8 +1,8 @@
  #!/usr/bin/env ruby
  # The compass command line utility
  
 -require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'compass'))
 -require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'compass', 'exec'))
-+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'ruby', '1.8', 'compass'))
-+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'ruby', '1.8', 'compass', 'exec'))
++require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'ruby', RUBY_VERSION.match(/^\d+\.\d+/).to_s, 'compass'))
++require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'ruby', RUBY_VERSION.match(/^\d+\.\d+/).to_s, 'compass', 'exec'))
  
  command = Compass::Exec::Compass.new(ARGV)
  exit command.run!

Modified: trunk/libcompass-ruby/debian/patches/get-version-from-right-place
===================================================================
--- trunk/libcompass-ruby/debian/patches/get-version-from-right-place	2010-03-06 20:57:41 UTC (rev 4912)
+++ trunk/libcompass-ruby/debian/patches/get-version-from-right-place	2010-03-06 21:23:34 UTC (rev 4913)
@@ -1,13 +1,13 @@
 Index: libcompass-ruby-0.8.5debian/lib/compass/version.rb
 ===================================================================
---- libcompass-ruby-0.8.5debian.orig/lib/compass/version.rb	2010-03-05 19:16:22.000000000 -0500
-+++ libcompass-ruby-0.8.5debian/lib/compass/version.rb	2010-03-05 19:16:21.000000000 -0500
+--- libcompass-ruby-0.8.5debian.orig/lib/compass/version.rb	2009-07-07 00:50:23.000000000 -0400
++++ libcompass-ruby-0.8.5debian/lib/compass/version.rb	2010-03-06 16:20:22.000000000 -0500
 @@ -28,7 +28,7 @@
  
      def read_version_file
        require 'yaml'
 -      @version = YAML::load(File.read(scope('VERSION.yml')))
-+      @version = YAML::load(File.read('/usr/lib/ruby/1.8/compass/VERSION.yml'))
++      @version = YAML::load(File.read(File.join('/usr/lib/ruby', RUBY_VERSION.match(/^\d+\.\d+/).to_s, 'compass/VERSION.yml'))
        @version[:string] = "#{@version[:major]}.#{@version[:minor]}.#{@version[:patch]}"
        @version[:teeny] = @version[:patch]
      end