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

[Ryan Niebur]

The following commit has been merged in the master branch:
commit 2de4c0d8d96511da93f6f17ad19d2dd3e98af8bd
Author: Ryan Niebur <ryanryan52 at gmail.com>
Date:   Sun Jan 8 02:46:37 2012 -0800

    refresh patch

diff --git a/debian/patches/fix_require_path_for_thin_parser.patch b/debian/patches/fix_require_path_for_thin_parser.patch
index 7642006..2b07484 100644
--- a/debian/patches/fix_require_path_for_thin_parser.patch
+++ b/debian/patches/fix_require_path_for_thin_parser.patch
@@ -4,9 +4,11 @@ Subject: Fix require path for thin_parser due to Debian installation path
 
 Author: Laurent Arnoud <laurent at spkdev.net>
 Forwarded: not-needed
---- a/lib/thin.rb
-+++ b/lib/thin.rb
-@@ -6,6 +6,7 @@ require 'forwardable'
+Index: ruby-thin/lib/thin.rb
+===================================================================
+--- ruby-thin.orig/lib/thin.rb	2012-01-08 02:44:52.000000000 -0800
++++ ruby-thin/lib/thin.rb	2012-01-08 02:46:18.000000000 -0800
+@@ -6,6 +6,7 @@
  require 'openssl'
  require 'eventmachine'
  require 'rack'
@@ -14,12 +16,12 @@ Forwarded: not-needed
  
  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 "#{Thin::ROOT}/#{Config::CONFIG['ruby_version']}/#{Config::CONFIG['arch']}/thin_parser"
- end
+@@ -38,7 +39,7 @@
+ require "#{Thin::ROOT}/thin/version"
+ require "#{Thin::ROOT}/thin/statuses"
+ require "#{Thin::ROOT}/rack/adapter/loader"
+-require "#{Thin::ROOT}/thin_parser"
++require "#{Thin::ROOT}/#{Config::CONFIG['ruby_version']}/#{Config::CONFIG['arch']}/thin_parser"
  
  module Rack
+   module Adapter

-- 
ruby-thin.git