[DRE-commits] [SCM] ruby-actionpack-2.3.git branch, master, updated. debian/2.3.14-2

[Ondřej Surý]

The following commit has been merged in the master branch:
commit 8fc996adb30768a121ee46dd2bf4bd224dc511ae
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Jun 1 15:26:20 2011 +0200

    Use packaged version of activesupport

diff --git a/debian/patches/0001-use_system_activesupport.patch b/debian/patches/0001-use_system_activesupport.patch
new file mode 100644
index 0000000..9949b79
--- /dev/null
+++ b/debian/patches/0001-use_system_activesupport.patch
@@ -0,0 +1,9 @@
+--- a/test/abstract_unit.rb
++++ b/test/abstract_unit.rb
+@@ -1,5 +1,5 @@
+ $:.unshift File.expand_path('../../lib', __FILE__)
+-$:.unshift File.expand_path('../../../activesupport/lib', __FILE__)
++require 'activesupport'
+ $:.unshift File.expand_path('../fixtures/helpers', __FILE__)
+ $:.unshift File.expand_path('../fixtures/alternate_helpers', __FILE__)
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2ece7f7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-use_system_activesupport.patch

-- 
ruby-actionpack-2.3.git