[DRE-commits] r3107 - packages/libactiverecord-ruby/trunk/debian/patches

[roberto at alioth.debian.org]

Author: roberto
Date: 2008-11-30 19:32:54 +0000 (Sun, 30 Nov 2008)
New Revision: 3107

Modified:
   packages/libactiverecord-ruby/trunk/debian/patches/01_ungem.patch
Log:
Update patch for new upstream version.

Modified: packages/libactiverecord-ruby/trunk/debian/patches/01_ungem.patch
===================================================================
--- packages/libactiverecord-ruby/trunk/debian/patches/01_ungem.patch	2008-11-30 19:12:39 UTC (rev 3106)
+++ packages/libactiverecord-ruby/trunk/debian/patches/01_ungem.patch	2008-11-30 19:32:54 UTC (rev 3107)
@@ -1,12 +1,12 @@
-diff -uNr activerecord-2.1.1.orig/lib/active_record.rb activerecord-2.1.1/lib/active_record.rb
---- activerecord-2.1.1.orig/lib/active_record.rb	2008-09-04 10:07:33.000000000 -0400
-+++ activerecord-2.1.1/lib/active_record.rb	2008-09-23 13:13:38.000000000 -0400
+diff -uNr activerecord-2.2.2.orig/lib/active_record.rb activerecord-2.2.2/lib/active_record.rb
+--- activerecord-2.2.2.orig/lib/active_record.rb	2008-11-21 12:32:46.000000000 -0500
++++ activerecord-2.2.2/lib/active_record.rb	2008-11-30 14:30:21.000000000 -0500
 @@ -24,7 +24,7 @@
- $:.unshift(File.dirname(__FILE__)) unless
-   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
- 
--active_support_path = File.dirname(__FILE__) + "/../../activesupport/lib"
-+active_support_path = File.dirname(__FILE__) + "/active_support"
- if File.exist?(active_support_path)
-   $:.unshift active_support_path
+ begin
    require 'active_support'
+ rescue LoadError
+-  activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
++  activesupport_path = "#{File.dirname(__FILE__)}/activesupport/lib"
+   if File.directory?(activesupport_path)
+     $:.unshift activesupport_path
+     require 'active_support'