[DRE-commits] [SCM] ruby-activerecord-3.2.git branch, master, updated. debian/3.2.3-3-8-g3737867

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit bcfafcde369508b9cab0121ccc2d68493fb5bc45
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Jun 14 14:08:02 2012 -0300

    Add patch to not force Rubygems

diff --git a/debian/patches/Remove_rubygems_dependency.patch b/debian/patches/Remove_rubygems_dependency.patch
new file mode 100644
index 0000000..920ab1f
--- /dev/null
+++ b/debian/patches/Remove_rubygems_dependency.patch
@@ -0,0 +1,43 @@
+Description: Remove dependency on Rubygems
+ This patch removes the need to have database adapter packages installed as
+ 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
+@@ -4,7 +4,6 @@ require 'active_record/connection_adapte
+ require 'arel/visitors/bind_visitor'
+ 
+ # Make sure we're using pg high enough for PGResult#values
+-gem 'pg', '~> 0.11'
+ 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
+@@ -1,6 +1,5 @@
+ require 'active_record/connection_adapters/sqlite_adapter'
+ 
+-gem 'sqlite3', '~> 1.3.5'
+ 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
+@@ -1,6 +1,5 @@
+ require 'active_record/connection_adapters/abstract_mysql_adapter'
+ 
+-gem 'mysql2', '~> 0.3.10'
+ require 'mysql2'
+ 
+ module ActiveRecord
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2d73934
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Remove_rubygems_dependency.patch

-- 
ruby-activerecord-3.2.git