[DRE-commits] [SCM] ruby-actionpack-2.3.git branch, debian-sid, updated. debian/2.3.11-2-7-gdce568b

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit 1379a9f2173e8b582e2be51e692f49e7650f2fdd
Author: Ondřej Surý <ondrej at sury.org>
Date:   Mon Aug 22 19:09:33 2011 +0200

    Disable load magic, use system ruby libraries

diff --git a/debian/patches/0002-dont_require_rubygems.patch b/debian/patches/0002-dont_require_rubygems.patch
new file mode 100644
index 0000000..39427a6
--- /dev/null
+++ b/debian/patches/0002-dont_require_rubygems.patch
@@ -0,0 +1,21 @@
+--- a/lib/action_controller.rb
++++ b/lib/action_controller.rb
+@@ -21,17 +21,7 @@
+ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #++
+ 
+-begin
+-  require 'active_support'
+-rescue LoadError
+-  activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
+-  if File.directory?(activesupport_path)
+-    $:.unshift activesupport_path
+-    require 'active_support'
+-  end
+-end
+-
+-gem 'rack', '~> 1.1.0'
++require 'active_support'
+ require 'rack'
+ require 'action_controller/cgi_ext'
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 2ece7f7..bb37496 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-use_system_activesupport.patch
+0002-dont_require_rubygems.patch

-- 
ruby-actionpack-2.3.git