[DRE-commits] r5052 - in trunk/libmemcache-client-ruby/debian: . patches

[Roberto C. Sanchez]

Author: roberto
Date: 2010-04-08 20:06:53 +0000 (Thu, 08 Apr 2010)
New Revision: 5052

Modified:
   trunk/libmemcache-client-ruby/debian/changelog
   trunk/libmemcache-client-ruby/debian/patches/no-rubygems.diff
Log:
debian/patches/no-rubygems.diff: Refresh patch

Modified: trunk/libmemcache-client-ruby/debian/changelog
===================================================================
--- trunk/libmemcache-client-ruby/debian/changelog	2010-04-08 19:56:20 UTC (rev 5051)
+++ trunk/libmemcache-client-ruby/debian/changelog	2010-04-08 20:06:53 UTC (rev 5052)
@@ -1,9 +1,10 @@
-libmemcache-client-ruby (1.7.8-1) UNRELEASED; urgency=low
+libmemcache-client-ruby (1.7.8-1) unstable; urgency=low
 
   * New upstream release
   * Update watchfile to use githubredir.debian.net
+  * debian/patches/no-rubygems.diff: Refresh patch
 
- -- Roberto C. Sanchez <roberto at connexer.com>  Wed, 31 Mar 2010 19:58:40 -0400
+ -- Roberto C. Sanchez <roberto at connexer.com>  Thu, 08 Apr 2010 16:06:40 -0400
 
 libmemcache-client-ruby (1.5.0-3) unstable; urgency=low
 

Modified: trunk/libmemcache-client-ruby/debian/patches/no-rubygems.diff
===================================================================
--- trunk/libmemcache-client-ruby/debian/patches/no-rubygems.diff	2010-04-08 19:56:20 UTC (rev 5051)
+++ trunk/libmemcache-client-ruby/debian/patches/no-rubygems.diff	2010-04-08 20:06:53 UTC (rev 5052)
@@ -1,10 +1,29 @@
---- a/lib/memcache.rb
-+++ b/lib/memcache.rb
-@@ -3,7 +3,6 @@ $TESTING = defined?($TESTING) && $TESTIN
- require 'socket'
- require 'thread'
- require 'timeout'
--require 'rubygems'
+--- mperham-memcache-client-053890f.orig/lib/memcache.rb
++++ mperham-memcache-client-053890f/lib/memcache.rb
+@@ -7,24 +7,8 @@
+ require 'digest/sha1'
+ require 'net/protocol'
  
- class String
+-begin
+-  # Try to use the SystemTimer gem instead of Ruby's timeout library
+-  # when running on something that looks like Ruby 1.8.x. See:
+-  #   http://ph7spot.com/articles/system_timer
+-  # We don't want to bother trying to load SystemTimer on jruby and
+-  # ruby 1.9+
+-  if defined?(JRUBY_VERSION) || (RUBY_VERSION >= '1.9')
+-    require 'timeout'
+-    MemCacheTimer = Timeout
+-  else
+-    require 'system_timer'
+-    MemCacheTimer = SystemTimer
+-  end
+-rescue LoadError => e
+-  puts "[memcache-client] Could not load SystemTimer gem, falling back to Ruby's slower/unsafe timeout library: #{e.message}"
+-  require 'timeout'
+-  MemCacheTimer = Timeout
+-end
++require 'timeout'
++MemCacheTimer = Timeout
  
+ 
+ ##