[DRE-commits] [diaspora] 03/07: relax jquery-rails

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master-0.5.7
in repository diaspora.

commit 550a4ffb2698632aaa8456e0e61950e078c47345
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Jul 6 20:18:46 2016 +0530

    relax jquery-rails
---
 debian/changelog                           | 3 ++-
 debian/patches/050-relax-stable-libs.patch | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8998b05..e37ef6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 diaspora (0.5.7.1+debian-2) UNRELEASED; urgency=medium
 
   * Fix syntax in Gemfile 
-  * Relax unicorn dependency in Gemfile 
+  * Relax unicorn dependency in Gemfile
+  * Relax jquery-rails dependency in Gemfile
 
  -- Pirate Praveen <praveen at debian.org>  Wed, 06 Jul 2016 20:01:44 +0530
 
diff --git a/debian/patches/050-relax-stable-libs.patch b/debian/patches/050-relax-stable-libs.patch
index 6c74793..945b52a 100644
--- a/debian/patches/050-relax-stable-libs.patch
+++ b/debian/patches/050-relax-stable-libs.patch
@@ -40,8 +40,12 @@ Index: diaspora/Gemfile
  gem "remotipart",  "1.2.1"
  
  # GUID generation
-@@ -88,7 +88,7 @@ gem "handlebars_assets", "0.23.0"
- gem "jquery-rails",      "4.1.0"
+@@ -85,10 +85,10 @@ gem "entypo-rails", "2.2.3"
+ 
+ gem "backbone-on-rails", "1.2.0.0"
+ gem "handlebars_assets", "0.23.0"
+-gem "jquery-rails",      "4.1.0"
++gem "jquery-rails",      "~> 4.0"
  gem "jquery-ui-rails",   "5.0.5"
  gem "js_image_paths",    "0.0.2"
 -gem "js-routes",         "1.2.3"

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