[DRE-commits] [SCM] ruby-activemodel-3.2.git branch, master, updated. debian/3.2.3-1-7-g568e788

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 2bedbbae3b1913d63b08fa749cd8230ec5ea8d02
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 16 09:43:06 2012 -0300

    avoid requiring bcrypt to be installed by rubygems

diff --git a/debian/changelog b/debian/changelog
index 2bc7b7c..3aff43a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-ruby-activemodel-3.2 (3.2.6-1) UNRELEASED; urgency=low
+ruby-activemodel-3.2 (3.2.6-1) unstable; urgency=low
 
   * New upstream release.
   * debian/control:
     + Add myself to Uploaders:
+    + Suggest ruby-bcrypt
+  * debian/patches/remove-rubygems-requirement.patch: do not require bcrypt to
+    be installed via Rubygems. As long as it is installed, it will work.
 
  -- Antonio Terceiro <terceiro at debian.org>  Fri, 15 Jun 2012 23:30:29 -0300
 
diff --git a/debian/control b/debian/control
index 045e4e0..1038269 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,7 @@ Depends: ${shlibs:Depends},
 	 ruby | ruby-interpreter,
 	 ruby-activesupport-3.2 (>= 3.2.6),
 	 ruby-activesupport-3.2 (<< 3.2.6.)
+Suggests: ruby-bcrypt (>= 3.0.0)
 Description: A toolkit for building modeling frameworks (part of Rails).
  Active Model is a toolkit for building modeling frameworks like
  Active Record and Active Resource.  This includes a rich support for
diff --git a/debian/patches/remove-rubygems-requirement.patch b/debian/patches/remove-rubygems-requirement.patch
new file mode 100644
index 0000000..34f4209
--- /dev/null
+++ b/debian/patches/remove-rubygems-requirement.patch
@@ -0,0 +1,17 @@
+Description: Remove Rubygems requirement
+ Remove the requirement to have the bcrypt library installed via Rubygems. As
+ long as it is installed, it should work.
+Author: Antonio Terceiro <terceiro at debian.org>
+
+---
+
+--- ruby-activemodel-3.2-3.2.6.orig/lib/active_model/secure_password.rb
++++ ruby-activemodel-3.2-3.2.6/lib/active_model/secure_password.rb
+@@ -34,7 +34,6 @@ module ActiveModel
+       def has_secure_password
+         # Load bcrypt-ruby only when has_secure_password is used.
+         # This is to avoid ActiveModel (and by extension the entire framework) being dependent on a binary library.
+-        gem 'bcrypt-ruby', '~> 3.0.0'
+         require 'bcrypt'
+ 
+         attr_reader :password
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..55525fb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+remove-rubygems-requirement.patch

-- 
ruby-activemodel-3.2.git