[DRE-commits] [diaspora] 02/06: fog is in sync

[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 2a4b9c00036a59a038bbe690918e824296914f5c
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Aug 28 20:04:23 2015 +0530

    fog is in sync
---
 debian/changelog                               | 5 +++--
 debian/control                                 | 2 +-
 debian/patches/020-loosen-minor-versions.patch | 9 ---------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4c1ea45..a7691a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
 diaspora (0.5.2.0+debian-7) UNRELEASED; urgency=medium
 
-  * Bump minimum version of diaspora-commin to 0.5.2.0+debian4 
+  * Bump minimum version of diaspora-common to 0.5.2.0+debian4 
   * Remove bin directory before install (to support switching from
      diaspora-installer)
   * Stop diaspora before upgrade
-  * Set minimum version for ruby-rails-assets-markdown-it
+  * Set minimum version for ruby-rails-assets-markdown-it to 4.4.0
+  * Set minimum version of ruby-fog to 1.31
 
  -- Pirate Praveen <praveen at debian.org>  Fri, 28 Aug 2015 14:52:07 +0530
 
diff --git a/debian/control b/debian/control
index be76a39..3ae830b 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-activerecord-import,
  ruby-foreigner,
  ruby-carrierwave (>= 0.10~),
- ruby-fog (>= 1.28~),
+ ruby-fog (>= 1.31~),
  ruby-mini-magick (>= 3.8.1~),
  ruby-remotipart,
  ruby-uuid,
diff --git a/debian/patches/020-loosen-minor-versions.patch b/debian/patches/020-loosen-minor-versions.patch
index c2aa5a2..6b6962f 100644
--- a/debian/patches/020-loosen-minor-versions.patch
+++ b/debian/patches/020-loosen-minor-versions.patch
@@ -2,15 +2,6 @@ Index: diaspora/Gemfile
 ===================================================================
 --- diaspora.orig/Gemfile
 +++ diaspora/Gemfile
-@@ -69,7 +69,7 @@ gem "activerecord-import", "0.8.0"
- # File uploading
- 
- gem "carrierwave", "0.10.0"
--gem "fog",         "1.31.0"
-+gem "fog",         "~> 1.30"
- gem "mini_magick", "4.2.7"
- gem "remotipart",  "1.2.1"
- 
 @@ -126,7 +126,7 @@ gem "messagebus_ruby_api", ">=1.0.3"
  # Parsing
  

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