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

[roberto at alioth.debian.org]

Author: roberto
Date: 2008-09-23 18:15:07 +0000 (Tue, 23 Sep 2008)
New Revision: 3020

Added:
   packages/libactivesupport-ruby/trunk/debian/README.source
   packages/libactivesupport-ruby/trunk/debian/patches/02_no_embedded_modules.patch
Modified:
   packages/libactivesupport-ruby/trunk/debian/changelog
   packages/libactivesupport-ruby/trunk/debian/control
   packages/libactivesupport-ruby/trunk/debian/patches/01_ungem.patch
   packages/libactivesupport-ruby/trunk/debian/rules
Log:
* New upstream release
* Now depend on the new libmemcache-client-ruby and libtzinfo-ruby packages
  rather than using the embedded sources from the upstream tarball

Added: packages/libactivesupport-ruby/trunk/debian/README.source
===================================================================
--- packages/libactivesupport-ruby/trunk/debian/README.source	                        (rev 0)
+++ packages/libactivesupport-ruby/trunk/debian/README.source	2008-09-23 18:15:07 UTC (rev 3020)
@@ -0,0 +1,3 @@
+This package uses cdbs's simple-patchsys to manage all modifications to the
+upstream source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.

Modified: packages/libactivesupport-ruby/trunk/debian/changelog
===================================================================
--- packages/libactivesupport-ruby/trunk/debian/changelog	2008-09-23 17:35:53 UTC (rev 3019)
+++ packages/libactivesupport-ruby/trunk/debian/changelog	2008-09-23 18:15:07 UTC (rev 3020)
@@ -1,8 +1,11 @@
-libactivesupport-ruby (2.1.0-4) UNRELEASED; urgency=low
+libactivesupport-ruby (2.1.1-1) unstable; urgency=low
 
+  * New upstream release
   * Add README.source to comply with Standards-Version 3.8.0
+  * Now depend on the new libmemcache-client-ruby and libtzinfo-ruby packages
+    rather than using the embedded sources from the upstream tarball
 
- -- Roberto C. Sanchez <roberto at connexer.com>  Sat, 30 Aug 2008 22:13:35 -0400
+ -- Roberto C. Sanchez <roberto at connexer.com>  Tue, 23 Sep 2008 14:11:24 -0400
 
 libactivesupport-ruby (2.1.0-3) unstable; urgency=high
 

Modified: packages/libactivesupport-ruby/trunk/debian/control
===================================================================
--- packages/libactivesupport-ruby/trunk/debian/control	2008-09-23 17:35:53 UTC (rev 3019)
+++ packages/libactivesupport-ruby/trunk/debian/control	2008-09-23 18:15:07 UTC (rev 3020)
@@ -23,7 +23,7 @@
 
 Package: libactivesupport-ruby1.8
 Architecture: all
-Depends: libruby1.8, libxml-simple-ruby (>> 1.0.11), libbuilder-ruby1.8 (>> 2.1.2)
+Depends: libruby1.8, libxml-simple-ruby (>> 1.0.11), libbuilder-ruby1.8 (>> 2.1.2), libmemcache-client-ruby1.8 (>> 1.5.0), libtzinfo-ruby1.8 (>> 0.3.10)
 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, libxml-simple-ruby (>> 1.0.11)
+Depends: libruby1.9, libxml-simple-ruby (>> 1.0.11), libmemcache-client-ruby1.9 (>> 1.5.0), libtzinfo-ruby1.9 (>> 0.3.10)
 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

Modified: packages/libactivesupport-ruby/trunk/debian/patches/01_ungem.patch
===================================================================
--- packages/libactivesupport-ruby/trunk/debian/patches/01_ungem.patch	2008-09-23 17:35:53 UTC (rev 3019)
+++ packages/libactivesupport-ruby/trunk/debian/patches/01_ungem.patch	2008-09-23 18:15:07 UTC (rev 3020)
@@ -1,15 +1,6 @@
-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
+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'
@@ -18,20 +9,3 @@
  
  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'

Added: packages/libactivesupport-ruby/trunk/debian/patches/02_no_embedded_modules.patch
===================================================================
--- packages/libactivesupport-ruby/trunk/debian/patches/02_no_embedded_modules.patch	                        (rev 0)
+++ packages/libactivesupport-ruby/trunk/debian/patches/02_no_embedded_modules.patch	2008-09-23 18:15:07 UTC (rev 3020)
@@ -0,0 +1,17 @@
+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 @@
+ #++
+ 
+ $:.unshift(File.dirname(__FILE__))
++$:.unshift(File.dirname(__FILE__) + "/lib")
+ 
+-require 'active_support/vendor'
++require 'builder'
++require 'xmlsimple'
++require 'memcache'
++require 'tzinfo'
+ require 'active_support/basic_object'
+ require 'active_support/inflector'
+ require 'active_support/callbacks'

Modified: packages/libactivesupport-ruby/trunk/debian/rules
===================================================================
--- packages/libactivesupport-ruby/trunk/debian/rules	2008-09-23 17:35:53 UTC (rev 3019)
+++ packages/libactivesupport-ruby/trunk/debian/rules	2008-09-23 18:15:07 UTC (rev 3020)
@@ -6,3 +6,6 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/ruby-pkg-tools/1/class/ruby-common.mk
 
+binary/libactivesupport-ruby::
+	rm -rf debian/*/usr/lib/ruby/*/active_support/vendor*
+