[DRE-commits] r4090 - trunk/thin/debian/patches

[Ryan Niebur]

Author: ryan52-guest
Date: 2009-09-07 08:27:58 +0000 (Mon, 07 Sep 2009)
New Revision: 4090

Removed:
   trunk/thin/debian/patches/remove-gems-dependancy
Modified:
   trunk/thin/debian/patches/fix-path
   trunk/thin/debian/patches/series
Log:
refresh patches

Modified: trunk/thin/debian/patches/fix-path
===================================================================
--- trunk/thin/debian/patches/fix-path	2009-09-07 08:25:24 UTC (rev 4089)
+++ trunk/thin/debian/patches/fix-path	2009-09-07 08:27:58 UTC (rev 4090)
@@ -2,18 +2,9 @@
 
 --- a/bin/thin
 +++ b/bin/thin
-@@ -1,6 +1,10 @@
+@@ -1,4 +1,4 @@
 -#!/usr/bin/env ruby
 +#!/usr/bin/ruby1.8
  # Thin command line interface script.
  # Run <tt>thin -h</tt> to get more usage.
--require File.dirname(__FILE__) + '/../lib/thin'
-+if File.exists?(File.dirname(__FILE__) + '/../lib/thin.rb')
-+  require File.dirname(__FILE__) + '/../lib/thin.rb'
-+else
-+  require '/usr/lib/ruby/1.8/thin.rb'
-+end
  
--Thin::Runner.new(ARGV).run!
-\ No newline at end of file
-+Thin::Runner.new(ARGV).run!

Deleted: trunk/thin/debian/patches/remove-gems-dependancy
===================================================================
--- trunk/thin/debian/patches/remove-gems-dependancy	2009-09-07 08:25:24 UTC (rev 4089)
+++ trunk/thin/debian/patches/remove-gems-dependancy	2009-09-07 08:27:58 UTC (rev 4090)
@@ -1,12 +0,0 @@
-# gems aren't needed, so remove the require
-
---- a/lib/thin.rb
-+++ b/lib/thin.rb
-@@ -6,7 +6,6 @@
- require 'time'
- require 'forwardable'
- 
--require 'rubygems'
- require 'openssl'
- require 'eventmachine'
- 

Modified: trunk/thin/debian/patches/series
===================================================================
--- trunk/thin/debian/patches/series	2009-09-07 08:25:24 UTC (rev 4089)
+++ trunk/thin/debian/patches/series	2009-09-07 08:27:58 UTC (rev 4090)
@@ -1,4 +1,3 @@
 fix-path
 fix-init-script
 dont-allow-install
-remove-gems-dependancy