Hi, I've uploaded libactiverecord-ruby/2.1.0-3 and libactivesupport-ruby/2.1.0-3. Between the two uploads, #496606 (grave), #496695 (important), and #496725 (grave) are closed. I have limited the changes exclusively to those required to close the above named bugs. The relevant changelog entries: libactiverecord-ruby (2.1.0-3) unstable; urgency=high . * Quit trying to load rubygems (Closes: #496606) * Add dependencies on SQL interfaces (Closes: #496695) libactivesupport-ruby (2.1.0-3) unstable; urgency=high . * Quit trying to load rubygems (Closes: #496725) The debdiffs are attached. Regards, -Roberto -- Roberto C. Sánchez http://people.connexer.com/~roberto http://www.connexer.com
diff -u libactiverecord-ruby-2.1.0/debian/control libactiverecord-ruby-2.1.0/debian/control --- libactiverecord-ruby-2.1.0/debian/control +++ libactiverecord-ruby-2.1.0/debian/control @@ -12,7 +12,7 @@ Package: libactiverecord-ruby Architecture: all -Depends: libactiverecord-ruby1.8, libactivesupport-ruby +Depends: libactiverecord-ruby1.8, libactivesupport-ruby (>= 2.1.0-3) Description: Ruby library that ties database tables to classes Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM. It ties database tables and classes together for business objects, like @@ -24,7 +24,7 @@ Package: libactiverecord-ruby1.8 Architecture: all -Depends: libruby1.8, libactivesupport-ruby1.8 +Depends: libruby1.8, libactivesupport-ruby1.8 (>= 2.1.0-3), libsqlite3-ruby1.8 | libpgsql-ruby1.8 | libmysql-ruby1.8 Description: Tie database tables to classes (Ruby 1.8) Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM. It ties database tables and classes together for business objects, like @@ -35,7 +35,7 @@ Package: libactiverecord-ruby1.9 Architecture: all -Depends: libruby1.9, libactivesupport-ruby1.9 +Depends: libruby1.9, libactivesupport-ruby1.9 (>= 2.1.0-3) Description: Tie database tables to classes (Ruby 1.9) Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM. It ties database tables and classes together for business objects, like diff -u libactiverecord-ruby-2.1.0/debian/changelog libactiverecord-ruby-2.1.0/debian/changelog --- libactiverecord-ruby-2.1.0/debian/changelog +++ libactiverecord-ruby-2.1.0/debian/changelog @@ -1,3 +1,10 @@ +libactiverecord-ruby (2.1.0-3) unstable; urgency=high + + * Quit trying to load rubygems (Closes: #496606) + * Add dependencies on SQL interfaces (Closes: #496695) + + -- Roberto C. Sanchez <roberto@connexer.com> Tue, 26 Aug 2008 21:32:11 -0400 + libactiverecord-ruby (2.1.0-2) unstable; urgency=high * Build-Depends on ruby-pkg-tools >= 0.14 and install 1.9 module files only in patch2: unchanged: --- libactiverecord-ruby-2.1.0.orig/debian/patches/01_ungem.patch +++ libactiverecord-ruby-2.1.0/debian/patches/01_ungem.patch @@ -0,0 +1,12 @@ +diff -ur activerecord-2.1.0.orig/lib/active_record.rb activerecord-2.1.0/lib/active_record.rb +--- activerecord-2.1.0.orig/lib/active_record.rb 2008-05-31 21:52:51.000000000 -0400 ++++ activerecord-2.1.0/lib/active_record.rb 2008-08-26 21:02:50.000000000 -0400 +@@ -25,7 +25,7 @@ + $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__))) + + unless defined? ActiveSupport +- 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 + require 'active_support'
diff -u libactivesupport-ruby-2.1.0/debian/control libactivesupport-ruby-2.1.0/debian/control --- libactivesupport-ruby-2.1.0/debian/control +++ libactivesupport-ruby-2.1.0/debian/control @@ -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 diff -u libactivesupport-ruby-2.1.0/debian/changelog libactivesupport-ruby-2.1.0/debian/changelog --- libactivesupport-ruby-2.1.0/debian/changelog +++ libactivesupport-ruby-2.1.0/debian/changelog @@ -1,3 +1,9 @@ +libactivesupport-ruby (2.1.0-3) unstable; urgency=high + + * Quit trying to load rubygems (Closes: #496725) + + -- Roberto C. Sanchez <roberto@connexer.com> Tue, 26 Aug 2008 21:55:22 -0400 + libactivesupport-ruby (2.1.0-2) unstable; urgency=high * Build-Depends on ruby-pkg-tools >= 0.14 and install 1.9 module files only in patch2: unchanged: --- libactivesupport-ruby-2.1.0.orig/debian/patches/01_ungem.patch +++ libactivesupport-ruby-2.1.0/debian/patches/01_ungem.patch @@ -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'
Attachment:
signature.asc
Description: Digital signature