[DRE-commits] r3108 - packages/libactivesupport-ruby/trunk/debian/patches

[roberto at alioth.debian.org]

Author: roberto
Date: 2008-11-30 20:15:15 +0000 (Sun, 30 Nov 2008)
New Revision: 3108

Removed:
   packages/libactivesupport-ruby/trunk/debian/patches/01_ungem.patch
Modified:
   packages/libactivesupport-ruby/trunk/debian/patches/02_no_embedded_modules.patch
Log:
Update patches for new upstream version.

Deleted: packages/libactivesupport-ruby/trunk/debian/patches/01_ungem.patch
===================================================================
--- packages/libactivesupport-ruby/trunk/debian/patches/01_ungem.patch	2008-11-30 19:32:54 UTC (rev 3107)
+++ packages/libactivesupport-ruby/trunk/debian/patches/01_ungem.patch	2008-11-30 20:15:15 UTC (rev 3108)
@@ -1,11 +0,0 @@
-diff -uNr activesupport-2.1.1.orig/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb activesupport-2.1.1/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb
---- activesupport-2.1.1.orig/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb	2008-09-04 10:07:34.000000000 -0400
-+++ activesupport-2.1.1/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb	2008-09-23 13:52:02.000000000 -0400
-@@ -30,7 +30,6 @@
- require 'socket'
- require 'thread'
- require 'timeout'
--require 'rubygems'
- 
- class String
- 

Modified: packages/libactivesupport-ruby/trunk/debian/patches/02_no_embedded_modules.patch
===================================================================
--- packages/libactivesupport-ruby/trunk/debian/patches/02_no_embedded_modules.patch	2008-11-30 19:32:54 UTC (rev 3107)
+++ packages/libactivesupport-ruby/trunk/debian/patches/02_no_embedded_modules.patch	2008-11-30 20:15:15 UTC (rev 3108)
@@ -1,17 +1,16 @@
-diff -uNr activesupport-2.1.1.orig/lib/active_support.rb activesupport-2.1.1/lib/active_support.rb
---- activesupport-2.1.1.orig/lib/active_support.rb	2008-09-04 10:07:34.000000000 -0400
-+++ activesupport-2.1.1/lib/active_support.rb	2008-09-23 13:53:50.000000000 -0400
-@@ -22,8 +22,12 @@
+diff -uNr activesupport-2.2.2.orig/lib/active_support.rb activesupport-2.2.2/lib/active_support.rb
+--- activesupport-2.2.2.orig/lib/active_support.rb	2008-11-21 12:32:45.000000000 -0500
++++ activesupport-2.2.2/lib/active_support.rb	2008-11-30 14:41:56.000000000 -0500
+@@ -21,7 +21,11 @@
+ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  #++
  
- $:.unshift(File.dirname(__FILE__))
-+$:.unshift(File.dirname(__FILE__) + "/lib")
- 
 -require 'active_support/vendor'
 +require 'builder'
 +require 'xmlsimple'
 +require 'memcache'
 +require 'tzinfo'
++require 'i18n'
  require 'active_support/basic_object'
  require 'active_support/inflector'
  require 'active_support/callbacks'