[DRE-commits] [diaspora] 03/06: sync tiny more tiny versions

[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 85f2363d91e63f74d2d4a91125ce7bdd63240c49
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Aug 28 21:52:54 2015 +0530

    sync tiny more tiny versions
---
 debian/changelog                              |  4 ++--
 debian/control                                |  6 +++---
 debian/patches/030-loosen-tiny-versions.patch | 23 -----------------------
 3 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a7691a0..cc83208 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,8 @@ diaspora (0.5.2.0+debian-7) UNRELEASED; urgency=medium
   * Remove bin directory before install (to support switching from
      diaspora-installer)
   * Stop diaspora before upgrade
-  * Set minimum version for ruby-rails-assets-markdown-it to 4.4.0
-  * Set minimum version of ruby-fog to 1.31
+  * Set minimum version for ruby-rails-assets-markdown-it, ruby-fog,
+    ruby-rack-rewrite, ruby-uuid, ruby-mini-magick
 
  -- Pirate Praveen <praveen at debian.org>  Fri, 28 Aug 2015 14:52:07 +0530
 
diff --git a/debian/control b/debian/control
index 3ae830b..6861cb7 100644
--- a/debian/control
+++ b/debian/control
@@ -42,9 +42,9 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-foreigner,
  ruby-carrierwave (>= 0.10~),
  ruby-fog (>= 1.31~),
- ruby-mini-magick (>= 3.8.1~),
+ ruby-mini-magick (>= 4.2.7~),
  ruby-remotipart,
- ruby-uuid,
+ ruby-uuid (>= 2.3.8),
  ruby-http-accept-language,
  ruby-i18n-inflector-rails,
  ruby-rails-i18n,
@@ -116,7 +116,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-rack-piwik (>=0.3.0),
  ruby-rack-protection,
  ruby-eye (>= 0.7~pre-1),
- ruby-rack-rewrite,
+ ruby-rack-rewrite (>= 1.5.1),
  ruby-rack-ssl,
  ruby-asset-sync,
  imagemagick,
diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
index 400fd61..f53a4ce 100644
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ b/debian/patches/030-loosen-tiny-versions.patch
@@ -41,20 +41,6 @@ Index: diaspora/Gemfile
  
  gem "activerecord-import", "0.8.0"
  
-@@ -70,11 +70,11 @@ gem "activerecord-import", "0.8.0"
- 
- gem "carrierwave", "0.10.0"
- gem "fog",         "~> 1.30"
--gem "mini_magick", "4.2.7"
-+gem "mini_magick", "~> 4.2.3"
- gem "remotipart",  "1.2.1"
- 
- # GUID generation
--gem "uuid", "2.3.8"
-+gem "uuid", "~> 2.3.7"
- 
- # Icons
- 
 @@ -82,15 +82,15 @@ gem "entypo-rails", "2.2.3"
  
  # JavaScript
@@ -137,12 +123,3 @@ Index: diaspora/Gemfile
  
    # Process management
  
-@@ -211,7 +211,7 @@ group :production do # we don"t install
- 
-   # Redirects
- 
--  gem "rack-rewrite", "1.5.1", require: false
-+  gem "rack-rewrite", "~> 1.5.0", require: false
-   gem "rack-ssl",     "1.4.1", require: "rack/ssl"
- 
-   # Third party asset hosting

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