[DRE-commits] [SCM] ruby-activerecord-3.2.git branch, master-experimental, updated. debian/3.2.6-2-23-g0f653df

[Ondřej Surý]

The following commit has been merged in the master-experimental branch:
commit 520e9f0364c8a303e1460a663d9efcadd1488423
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue Mar 19 10:14:45 2013 +0100

    Update patch for 3.2.13 release

diff --git a/debian/patches/Remove_rubygems_dependency.patch b/debian/patches/Remove_rubygems_dependency.patch
index 920ab1f..36767d1 100644
--- a/debian/patches/Remove_rubygems_dependency.patch
+++ b/debian/patches/Remove_rubygems_dependency.patch
@@ -3,8 +3,8 @@ Description: Remove dependency on Rubygems
  gems. Just require them directly.
 Author: Antonio Terceiro<terceiro at debian.org>
 
---- ruby-activerecord-3.2-3.2.3.orig/lib/active_record/connection_adapters/postgresql_adapter.rb
-+++ ruby-activerecord-3.2-3.2.3/lib/active_record/connection_adapters/postgresql_adapter.rb
+--- a/lib/active_record/connection_adapters/postgresql_adapter.rb
++++ b/lib/active_record/connection_adapters/postgresql_adapter.rb
 @@ -4,7 +4,6 @@ require 'active_record/connection_adapte
  require 'arel/visitors/bind_visitor'
  
@@ -13,8 +13,8 @@ Author: Antonio Terceiro<terceiro at debian.org>
  require 'pg'
  
  module ActiveRecord
---- ruby-activerecord-3.2-3.2.3.orig/lib/active_record/connection_adapters/sqlite3_adapter.rb
-+++ ruby-activerecord-3.2-3.2.3/lib/active_record/connection_adapters/sqlite3_adapter.rb
+--- a/lib/active_record/connection_adapters/sqlite3_adapter.rb
++++ b/lib/active_record/connection_adapters/sqlite3_adapter.rb
 @@ -1,6 +1,5 @@
  require 'active_record/connection_adapters/sqlite_adapter'
  
@@ -22,18 +22,8 @@ Author: Antonio Terceiro<terceiro at debian.org>
  require 'sqlite3'
  
  module ActiveRecord
---- ruby-activerecord-3.2-3.2.3.orig/lib/active_record/connection_adapters/mysql_adapter.rb
-+++ ruby-activerecord-3.2-3.2.3/lib/active_record/connection_adapters/mysql_adapter.rb
-@@ -2,7 +2,6 @@ require 'active_record/connection_adapte
- require 'active_record/connection_adapters/statement_pool'
- require 'active_support/core_ext/hash/keys'
- 
--gem 'mysql', '~> 2.8.1'
- require 'mysql'
- 
- class Mysql
---- ruby-activerecord-3.2-3.2.3.orig/lib/active_record/connection_adapters/mysql2_adapter.rb
-+++ ruby-activerecord-3.2-3.2.3/lib/active_record/connection_adapters/mysql2_adapter.rb
+--- a/lib/active_record/connection_adapters/mysql2_adapter.rb
++++ b/lib/active_record/connection_adapters/mysql2_adapter.rb
 @@ -1,6 +1,5 @@
  require 'active_record/connection_adapters/abstract_mysql_adapter'
  

-- 
ruby-activerecord-3.2.git