[DRE-commits] [diaspora] 02/03: relax devise

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora.

commit f42964bbec96488118cf3a29c80dfdb9fdc12200
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Jun 29 15:09:24 2016 +0530

    relax devise
---
 debian/control                        |  4 ++--
 debian/patches/060-relax-devise.patch | 16 ++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 1687255..5932cae 100644
--- a/debian/control
+++ b/debian/control
@@ -27,10 +27,10 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-acts-as-api,
  ruby-json,
  ruby-json-schema (>= 2.6.0~),
- ruby-devise (>= 3.5.6~),
+ ruby-devise (>= 4.0~),
  ruby-devise-lastseenable (>= 0.0.6~),
  ruby-devise-lastseenable (<< 0.1),
- ruby-devise-token-authenticatable,
+ ruby-devise-token-authenticatable (>= 0.5.1~),
  ruby-simple-captcha2 (>= 0.4~),
  ruby-sidekiq (>= 4.0~),
  ruby-sinatra (>= 1.4.7~),
diff --git a/debian/patches/060-relax-devise.patch b/debian/patches/060-relax-devise.patch
new file mode 100644
index 0000000..3afc088
--- /dev/null
+++ b/debian/patches/060-relax-devise.patch
@@ -0,0 +1,16 @@
+Index: diaspora/Gemfile
+===================================================================
+--- diaspora.orig/Gemfile
++++ diaspora/Gemfile
+@@ -22,9 +22,9 @@ gem "json-schema", "~> 2.6"
+ 
+ # Authentication
+ 
+-gem "devise", "3.5.6"
++gem "devise", "~> 4.0"
+ gem "devise_lastseenable", "~> 0.0.6"
+-gem "devise-token_authenticatable", "~> 0.4.0"
++gem "devise-token_authenticatable", "~> 0.5.1"
+ 
+ # Captcha
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 11a5ea1..a311c5a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 045-replace-sidetiq.patch
 050-relax-stable-libs.patch
 051-relax-patch-release-versions.patch
+060-relax-devise.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git