[DRE-commits] [diaspora] 06/07: relax addressable

[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 9169afe2223cbb18216a220b8b5f543f1bd574ae
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Jul 6 20:34:22 2016 +0530

    relax addressable
---
 debian/changelog                           | 12 +++++++-----
 debian/patches/050-relax-stable-libs.patch |  9 +++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d5b9b0e..692fb38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
 diaspora (0.5.7.1+debian-2) UNRELEASED; urgency=medium
 
-  * Fix syntax in Gemfile 
-  * Relax unicorn dependency in Gemfile
-  * Relax jquery-rails dependency in Gemfile
-  * Relax rails-assets-jquery in Gemfile
-  * Disable diaspora-vines in Gemfile
+  [ Gemfile changes ]
+  * Fix syntax
+  * Relax unicorn
+  * Relax jquery-rails
+  * Relax rails-assets-jquery
+  * Disable diaspora-vines
+  * Relax addressable
 
  -- 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 9c4fde8..722e7c4 100644
--- a/debian/patches/050-relax-stable-libs.patch
+++ b/debian/patches/050-relax-stable-libs.patch
@@ -101,6 +101,15 @@ Index: diaspora/Gemfile
  gem "omniauth-wordpress", "0.2.2"
  
  # Serializers
+@@ -156,7 +156,7 @@ gem "acts-as-taggable-on", "3.5.0"
+ 
+ # URIs and HTTP
+ 
+-gem "addressable",        "2.3.8", require: "addressable/uri"
++gem "addressable",        "~> 2.3", require: "addressable/uri"
+ gem "faraday",            "0.9.2"
+ gem "faraday_middleware", "0.10.0"
+ gem "faraday-cookie_jar", "0.0.6"
 @@ -167,7 +167,7 @@ gem "typhoeus",           "0.8.0"
  gem "gon",                     "6.0.1"
  gem "haml",                    "4.0.7"

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