[DRE-commits] r2963 - in packages/libactivesupport-ruby/trunk/debian: . patches

[roberto at alioth.debian.org]

Author: roberto
Date: 2008-08-27 02:03:49 +0000 (Wed, 27 Aug 2008)
New Revision: 2963

Added:
   packages/libactivesupport-ruby/trunk/debian/patches/
   packages/libactivesupport-ruby/trunk/debian/patches/01_ungem.patch
Modified:
   packages/libactivesupport-ruby/trunk/debian/changelog
   packages/libactivesupport-ruby/trunk/debian/control
Log:
Quit trying to load rubygems (Closes: #496725)

Modified: packages/libactivesupport-ruby/trunk/debian/changelog
===================================================================
--- packages/libactivesupport-ruby/trunk/debian/changelog	2008-08-27 01:47:44 UTC (rev 2962)
+++ packages/libactivesupport-ruby/trunk/debian/changelog	2008-08-27 02:03:49 UTC (rev 2963)
@@ -1,8 +1,8 @@
-libactivesupport-ruby (2.1.0-3) UNRELEASED; urgency=low
+libactivesupport-ruby (2.1.0-3) unstable; urgency=high
 
-  * NOT RELEASED YET
+  * Quit trying to load rubygems (Closes: #496725)
 
- -- Roberto C. Sanchez <roberto at connexer.com>  Tue, 17 Jun 2008 02:21:26 -0400
+ -- Roberto C. Sanchez <roberto at connexer.com>  Tue, 26 Aug 2008 21:55:22 -0400
 
 libactivesupport-ruby (2.1.0-2) unstable; urgency=high
 

Modified: packages/libactivesupport-ruby/trunk/debian/control
===================================================================
--- packages/libactivesupport-ruby/trunk/debian/control	2008-08-27 01:47:44 UTC (rev 2962)
+++ packages/libactivesupport-ruby/trunk/debian/control	2008-08-27 02:03:49 UTC (rev 2963)
@@ -23,7 +23,7 @@
 
 Package: libactivesupport-ruby1.8
 Architecture: all
-Depends: libruby1.8
+Depends: libruby1.8, libxml-simple-ruby (>> 1.0.11), libbuilder-ruby1.8 (>> 2.1.2)
 Description: utility classes and extensions (Ruby 1.8)
  ActiveSupport consists of utility classes and extensions to the Ruby
  standard library that were required for Rails but found to be
@@ -33,7 +33,7 @@
 
 Package: libactivesupport-ruby1.9
 Architecture: all
-Depends: libruby1.9
+Depends: libruby1.9, libxml-simple-ruby (>> 1.0.11)
 Description: utility classes and extensions (Ruby 1.9)
  ActiveSupport consists of utility classes and extensions to the Ruby
  standard library that were required for Rails but found to be

Added: packages/libactivesupport-ruby/trunk/debian/patches/01_ungem.patch
===================================================================
--- packages/libactivesupport-ruby/trunk/debian/patches/01_ungem.patch	                        (rev 0)
+++ packages/libactivesupport-ruby/trunk/debian/patches/01_ungem.patch	2008-08-27 02:03:49 UTC (rev 2963)
@@ -0,0 +1,37 @@
+diff -ur activesupport-2.1.0.orig/lib/active_support/cache/mem_cache_store.rb activesupport-2.1.0/lib/active_support/cache/mem_cache_store.rb
+--- activesupport-2.1.0.orig/lib/active_support/cache/mem_cache_store.rb	2008-05-31 21:52:51.000000000 -0400
++++ activesupport-2.1.0/lib/active_support/cache/mem_cache_store.rb	2008-08-26 21:09:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-require 'memcache'
++require 'active_support/vendor/memcache-client-1.5.0/memcache'
+ 
+ module ActiveSupport
+   module Cache
+diff -ur activesupport-2.1.0.orig/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb activesupport-2.1.0/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb
+--- activesupport-2.1.0.orig/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb	2008-05-31 21:52:51.000000000 -0400
++++ activesupport-2.1.0/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb	2008-08-26 21:10:39.000000000 -0400
+@@ -30,7 +30,6 @@
+ require 'socket'
+ require 'thread'
+ require 'timeout'
+-require 'rubygems'
+ 
+ class String
+ 
+diff -ur activesupport-2.1.0.orig/lib/active_support.rb activesupport-2.1.0/lib/active_support.rb
+--- activesupport-2.1.0.orig/lib/active_support.rb	2008-05-31 21:52:51.000000000 -0400
++++ activesupport-2.1.0/lib/active_support.rb	2008-08-26 21:08:41.000000000 -0400
+@@ -22,8 +22,12 @@
+ #++
+ 
+ $:.unshift(File.dirname(__FILE__))
++$:.unshift(File.dirname(__FILE__) + "/lib")
+ 
+-require 'active_support/vendor'
++require 'builder'
++require 'xmlsimple'
++require 'active_support/vendor/memcache-client-1.5.0/memcache'
++require 'active_support/vendor/tzinfo-0.3.8/tzinfo'
+ require 'active_support/basic_object'
+ require 'active_support/inflector'
+ require 'active_support/callbacks'