[DRE-commits] [SCM] ruby-thin.git branch, master, updated. upstream/1.2.11-9-g7c5cb70

[Laurent Arnoud]

The following commit has been merged in the master branch:
commit 7c5cb70d07d15defb5ee3ccee48be35a1156b66f
Author: Laurent Arnoud <laurent at spkdev.net>
Date:   Tue May 31 23:51:00 2011 +0200

    Add patch for require thin parser
    
    Signed-off-by: Laurent Arnoud <laurent at spkdev.net>

diff --git a/debian/patches/fix_require_path_for_thin_parser.patch b/debian/patches/fix_require_path_for_thin_parser.patch
new file mode 100644
index 0000000..a6cfa6a
--- /dev/null
+++ b/debian/patches/fix_require_path_for_thin_parser.patch
@@ -0,0 +1,25 @@
+Subject: Fix require path for thin_parser due to Debian installation path
+
+* lib/thin.rb: Using rbconfig for archdir
+
+Author: Laurent Arnoud <laurent at spkdev.net>
+Forwarded: not-needed
+--- a/lib/thin.rb
++++ b/lib/thin.rb
+@@ -6,6 +6,7 @@ require 'forwardable'
+ require 'openssl'
+ require 'eventmachine'
+ require 'rack'
++require 'rbconfig'
+ 
+ module Thin
+   ROOT = File.expand_path(File.dirname(__FILE__))
+@@ -44,7 +45,7 @@ if Thin.win?
+   major_ruby_version = RUBY_VERSION[/^(\d+\.\d+)/]
+   require "#{Thin::ROOT}/#{major_ruby_version}/thin_parser"
+ else
+-  require "#{Thin::ROOT}/thin_parser"
++  require "#{Config::CONFIG['vendorarchdir']}/thin_parser"
+ end
+ 
+ module Rack
diff --git a/debian/patches/series b/debian/patches/series
index 7ab0f89..eb9fd39 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix-init-script
 dont-allow-install
+fix_require_path_for_thin_parser.patch

-- 
ruby-thin.git