[DRE-commits] r4911 - in trunk/libcompass-ruby/debian: . patches

[Micah Anderson]

Author: micah
Date: 2010-03-06 20:49:13 +0000 (Sat, 06 Mar 2010)
New Revision: 4911

Added:
   trunk/libcompass-ruby/debian/patches/fix-binary-load-path
Modified:
   trunk/libcompass-ruby/debian/changelog
   trunk/libcompass-ruby/debian/patches/put-frameworks-in-usr-share
   trunk/libcompass-ruby/debian/patches/series
Log:
fix binary load path and framework default directory

Modified: trunk/libcompass-ruby/debian/changelog
===================================================================
--- trunk/libcompass-ruby/debian/changelog	2010-03-06 19:30:37 UTC (rev 4910)
+++ trunk/libcompass-ruby/debian/changelog	2010-03-06 20:49:13 UTC (rev 4911)
@@ -1,3 +1,9 @@
+libcompass-ruby (0.8.5debian-3) unstable; urgency=low
+
+  * Fix binary load path and framework default directory
+
+ -- Micah Anderson <micah at debian.org>  Sat, 06 Mar 2010 14:30:43 -0500
+
 libcompass-ruby (0.8.5debian-2) unstable; urgency=low
 
   * Depend on the libfssm-ruby libraries

Added: trunk/libcompass-ruby/debian/patches/fix-binary-load-path
===================================================================
--- trunk/libcompass-ruby/debian/patches/fix-binary-load-path	                        (rev 0)
+++ trunk/libcompass-ruby/debian/patches/fix-binary-load-path	2010-03-06 20:49:13 UTC (rev 4911)
@@ -0,0 +1,15 @@
+Index: libcompass-ruby-0.8.5debian/bin/compass
+===================================================================
+--- libcompass-ruby-0.8.5debian.orig/bin/compass	2010-03-06 15:19:54.000000000 -0500
++++ libcompass-ruby-0.8.5debian/bin/compass	2010-03-06 15:19:51.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', '#{RUBY_VERSION}', 'compass'))
++require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'ruby', '#{RUBY_VERSION}', 'compass', 'exec'))
+ 
+ command = Compass::Exec::Compass.new(ARGV)
+ exit command.run!

Modified: trunk/libcompass-ruby/debian/patches/put-frameworks-in-usr-share
===================================================================
--- trunk/libcompass-ruby/debian/patches/put-frameworks-in-usr-share	2010-03-06 19:30:37 UTC (rev 4910)
+++ trunk/libcompass-ruby/debian/patches/put-frameworks-in-usr-share	2010-03-06 20:49:13 UTC (rev 4911)
@@ -1,24 +1,37 @@
 Index: libcompass-ruby-0.8.5debian/frameworks/blueprint.rb
 ===================================================================
---- libcompass-ruby-0.8.5debian.orig/frameworks/blueprint.rb	2010-03-05 19:58:15.000000000 -0500
-+++ libcompass-ruby-0.8.5debian/frameworks/blueprint.rb	2010-03-05 19:56:32.000000000 -0500
+--- libcompass-ruby-0.8.5debian.orig/frameworks/blueprint.rb	2009-07-07 00:50:23.000000000 -0400
++++ libcompass-ruby-0.8.5debian/frameworks/blueprint.rb	2010-03-06 15:43:28.000000000 -0500
 @@ -1,2 +1,2 @@
 -blueprint_dir = File.join(Compass.base_directory, 'frameworks', 'blueprint')
 +blueprint_dir = File.join('/usr/share/compass/frameworks', 'blueprint')
  Compass::Frameworks.register('blueprint', blueprint_dir)
 Index: libcompass-ruby-0.8.5debian/frameworks/compass.rb
 ===================================================================
---- libcompass-ruby-0.8.5debian.orig/frameworks/compass.rb	2010-03-05 19:58:15.000000000 -0500
-+++ libcompass-ruby-0.8.5debian/frameworks/compass.rb	2010-03-05 19:56:42.000000000 -0500
+--- libcompass-ruby-0.8.5debian.orig/frameworks/compass.rb	2009-07-07 00:50:23.000000000 -0400
++++ libcompass-ruby-0.8.5debian/frameworks/compass.rb	2010-03-06 15:43:28.000000000 -0500
 @@ -1,2 +1,2 @@
 -compass_dir = File.join(Compass.base_directory, 'frameworks', 'compass')
 +compass_dir = File.join('/usr/share/compass/frameworks', 'compass')
  Compass::Frameworks.register('compass', compass_dir)
 Index: libcompass-ruby-0.8.5debian/frameworks/yui.rb
 ===================================================================
---- libcompass-ruby-0.8.5debian.orig/frameworks/yui.rb	2010-03-05 19:58:15.000000000 -0500
-+++ libcompass-ruby-0.8.5debian/frameworks/yui.rb	2010-03-05 19:56:52.000000000 -0500
+--- libcompass-ruby-0.8.5debian.orig/frameworks/yui.rb	2009-07-07 00:50:23.000000000 -0400
++++ libcompass-ruby-0.8.5debian/frameworks/yui.rb	2010-03-06 15:43:28.000000000 -0500
 @@ -1,2 +1,2 @@
 -yui_dir = File.join(Compass.base_directory, 'frameworks', 'yui')
 +yui_dir = File.join('/usr/share/compass/frameworks', 'yui')
  Compass::Frameworks.register('yui', yui_dir)
+Index: libcompass-ruby-0.8.5debian/lib/compass/frameworks.rb
+===================================================================
+--- libcompass-ruby-0.8.5debian.orig/lib/compass/frameworks.rb	2010-03-06 15:44:26.000000000 -0500
++++ libcompass-ruby-0.8.5debian/lib/compass/frameworks.rb	2010-03-06 15:44:25.000000000 -0500
+@@ -23,7 +23,7 @@
+ end
+ 
+ # Import all of the default frameworks.
+-default_frameworks_directory = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'frameworks'))
++default_frameworks_directory = File.expand_path(File.join('/usr/share/compass', 'frameworks'))
+ Dir.glob(File.join(default_frameworks_directory, "*.rb")).each do |framework|
+   require framework
+ end

Modified: trunk/libcompass-ruby/debian/patches/series
===================================================================
--- trunk/libcompass-ruby/debian/patches/series	2010-03-06 19:30:37 UTC (rev 4910)
+++ trunk/libcompass-ruby/debian/patches/series	2010-03-06 20:49:13 UTC (rev 4911)
@@ -1,2 +1,3 @@
+fix-binary-load-path
 get-version-from-right-place
 put-frameworks-in-usr-share