[DRE-commits] [SCM] ruby-activerecord-3.2.git branch, master, updated. debian/3.2.6-5-27-g2ee0c93

[Ondřej Surý]

The following commit has been merged in the master branch:
commit 388641003c75fcec4192cffb7ec98cb757f9e3e1
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Mar 20 14:13:29 2013 +0100

    Remove gem dependency from mysql_adapter as well

diff --git a/debian/patches/Remove_rubygems_dependency.patch b/debian/patches/Remove_rubygems_dependency.patch
index 36767d1..93bb725 100644
--- a/debian/patches/Remove_rubygems_dependency.patch
+++ b/debian/patches/Remove_rubygems_dependency.patch
@@ -31,3 +31,13 @@ Author: Antonio Terceiro<terceiro at debian.org>
  require 'mysql2'
  
  module ActiveRecord
+--- a/lib/active_record/connection_adapters/mysql_adapter.rb
++++ b/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'
+ require 'mysql'
+ 
+ class Mysql

-- 
ruby-activerecord-3.2.git