[DRE-commits] [thin] 01/02: Use standard search path for thin_parser

[Christian Hofstaedtler]

This is an automated email from the git hooks/post-receive script.

zeha pushed a commit to branch master
in repository thin.

commit 206c6049496e05bbb17bb230783ff76ca54be092
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Wed Feb 26 00:21:53 2014 +0100

    Use standard search path for thin_parser
    
    Closes: #737032
---
 debian/patches/fix_require_path_for_thin_parser.patch | 7 ++++---
 debian/rules                                          | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/patches/fix_require_path_for_thin_parser.patch b/debian/patches/fix_require_path_for_thin_parser.patch
index 188cf42..2edb810 100644
--- a/debian/patches/fix_require_path_for_thin_parser.patch
+++ b/debian/patches/fix_require_path_for_thin_parser.patch
@@ -1,9 +1,10 @@
 Subject: Fix require path for thin_parser due to Debian installation path
 
-* lib/thin.rb: Using rbconfig for archdir
+* lib/thin.rb: Use standard search path rules for thin_parser.
 
-Author: Laurent Arnoud <laurent at spkdev.net>
+Author: Laurent Arnoud <laurent at spkdev.net>, Christian Hofstaedtler <zeha at debian.org>
 Forwarded: not-needed
+Last-Update: 2014-02-26
 Index: ruby-thin/lib/thin.rb
 ===================================================================
 --- ruby-thin.orig/lib/thin.rb	2012-01-10 00:56:06.000000000 -0800
@@ -21,7 +22,7 @@ Index: ruby-thin/lib/thin.rb
  require "#{Thin::ROOT}/thin/statuses"
  require "#{Thin::ROOT}/rack/adapter/loader"
 -require "#{Thin::ROOT}/thin_parser"
-+require "#{Thin::ROOT}/#{RbConfig::CONFIG['ruby_version']}/#{RbConfig::CONFIG['arch']}/thin_parser"
++require "thin_parser"
  
  module Rack
    module Adapter
diff --git a/debian/rules b/debian/rules
index ccfb38c..8237786 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,8 @@
 # If you need to specify the .gemspec (eg there is more than one)
 #export DH_RUBY_GEMSPEC=gem.gemspec
 
+INSTALLED_RUBYLIB=$(shell ruby -e 'puts $$:.map { |x| "debian/thin"+x }.join(":")')
+
 %:
 	dh $@ --buildsystem=ruby --with ruby
 
@@ -19,5 +21,5 @@ override_dh_install:
 	dh_install
 
 override_dh_installman:
-	RUBYLIB=./debian/thin/usr/lib/ruby/vendor_ruby/ help2man -n "fast and very simple Ruby web server" ./bin/thin > debian/thin.manpage
+	RUBYLIB=$(INSTALLED_RUBYLIB) help2man -n "fast and very simple Ruby web server" ./bin/thin > debian/thin.manpage
 	dh_installman

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/thin.git