[DRE-commits] [diaspora] 03/03: relax fog

[Praveen Arimbrathodiyil]

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

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

commit beaa88a3aa1db358e0191d776215afd69f73f900
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Jul 6 20:16:28 2016 +0530

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

diff --git a/debian/changelog b/debian/changelog
index 71e5615..2cdd4b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 diaspora (0.5.5.1+debian-10) UNRELEASED; urgency=medium
 
-  * Relax active_model_serializers in Gemfile 
+  * Relax active_model_serializers in Gemfile
+  * Relax fog in Gemfile
 
  -- Pirate Praveen <praveen at debian.org>  Wed, 06 Jul 2016 19:37:39 +0530
 
diff --git a/debian/patches/050-relax-stable-libs.patch b/debian/patches/050-relax-stable-libs.patch
index 55faec8..9cd1de5 100644
--- a/debian/patches/050-relax-stable-libs.patch
+++ b/debian/patches/050-relax-stable-libs.patch
@@ -36,11 +36,13 @@ Index: diaspora/Gemfile
  
  # Database
  
-@@ -71,7 +71,7 @@ gem "activerecord-import", "0.10.0"
+@@ -70,8 +70,8 @@ gem "activerecord-import", "0.10.0"
+ # File uploading
  
  gem "carrierwave", "0.10.0"
- gem "fog",         "1.34.0"
+-gem "fog",         "1.34.0"
 -gem "mini_magick", "4.3.6"
++gem "fog",         "~> 1.34"
 +gem "mini_magick", "~> 4.3"
  gem "remotipart",  "1.2.1"
  

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