[DRE-commits] [diaspora] 01/01: allow unicorn 5.0

[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 26f0c8f2299971fc7516aa38ba7ded6617f27fea
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Jul 21 18:20:29 2016 +0530

    allow unicorn 5.0
---
 debian/changelog                           |  6 ++++++
 debian/control                             |  2 +-
 debian/patches/050-relax-stable-libs.patch | 28 +++++++++++++---------------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6b09e64..57fe4ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+diaspora (0.5.7.1+debian-4) unstable; urgency=medium
+
+  * Allow unicorn 5.0 
+
+ -- Pirate Praveen <praveen at debian.org>  Thu, 21 Jul 2016 18:20:16 +0530
+
 diaspora (0.5.7.1+debian-3) unstable; urgency=medium
 
   * Reupload to unstable 
diff --git a/debian/control b/debian/control
index b677b55..8782286 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-responders (>= 2.1.0~),
  ruby-actionpack-action-caching,
  ruby-actionpack-page-caching,
- unicorn (>= 4.9.0~),
+ unicorn (>= 5.0.1~),
  ruby-diaspora-federation-rails (>= 0.0.12~),
  ruby-acts-as-api,
  ruby-json,
diff --git a/debian/patches/050-relax-stable-libs.patch b/debian/patches/050-relax-stable-libs.patch
index 722e7c4..2b5146d 100644
--- a/debian/patches/050-relax-stable-libs.patch
+++ b/debian/patches/050-relax-stable-libs.patch
@@ -1,19 +1,17 @@
 minor versions of stable libraries can be relaxed
 
-Index: diaspora/Gemfile
-===================================================================
---- diaspora.orig/Gemfile
-+++ diaspora/Gemfile
-@@ -8,7 +8,7 @@ gem "responders", "2.1.1"
+--- a/Gemfile
++++ b/Gemfile
+@@ -8,7 +8,7 @@
  
  # Appserver
  
 -gem "unicorn", "5.0.1", require: false
-+gem "unicorn", "~> 4.9", require: false
++gem "unicorn", "~> 5.0", require: false
  
  # Federation
  
-@@ -18,7 +18,7 @@ gem "diaspora_federation-rails", "0.0.12
+@@ -18,7 +18,7 @@
  
  gem "acts_as_api", "0.4.2"
  gem "json",        "1.8.3"
@@ -22,7 +20,7 @@ Index: diaspora/Gemfile
  
  # Authentication
  
-@@ -56,7 +56,7 @@ gem "rack-cors", "0.4.0", require: "rack
+@@ -56,7 +56,7 @@
  gem "bootstrap-sass", "2.3.2.2", path: 'vendor/gems/bootstrap-sass-2.3.2.2'
  gem "compass-rails",  "2.0.5"
  gem "sass-rails",     "~> 5.0"
@@ -31,7 +29,7 @@ Index: diaspora/Gemfile
  
  # Database
  
-@@ -71,7 +71,7 @@ gem "activerecord-import", "0.11.0"
+@@ -71,7 +71,7 @@
  
  gem "carrierwave", "0.10.0"
  gem "fog",         "1.37.0"
@@ -40,7 +38,7 @@ Index: diaspora/Gemfile
  gem "remotipart",  "1.2.1"
  
  # GUID generation
-@@ -85,13 +85,13 @@ gem "entypo-rails", "2.2.3"
+@@ -85,13 +85,13 @@
  
  gem "backbone-on-rails", "1.2.0.0"
  gem "handlebars_assets", "0.23.0"
@@ -57,7 +55,7 @@ Index: diaspora/Gemfile
  
    gem "rails-assets-markdown-it",                         "6.0.0"
    gem "rails-assets-markdown-it-hashtag",                 "0.4.0"
-@@ -105,7 +105,7 @@ source "https://rails-assets.org" do
+@@ -105,7 +105,7 @@
    # jQuery plugins
  
    gem "rails-assets-jeresig--jquery.hotkeys",       "0.2.0"
@@ -66,7 +64,7 @@ Index: diaspora/Gemfile
    gem "rails-assets-jquery-textchange",             "0.2.3"
    gem "rails-assets-perfect-scrollbar",             "0.6.10"
    gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11"
-@@ -117,7 +117,7 @@ gem "facebox-rails", "0.2.0"
+@@ -117,7 +117,7 @@
  
  gem "http_accept_language", "2.0.5"
  gem "i18n-inflector-rails", "1.0.7"
@@ -75,7 +73,7 @@ Index: diaspora/Gemfile
  
  # Mail
  
-@@ -126,20 +126,20 @@ gem "messagebus_ruby_api", "1.0.3"
+@@ -126,20 +126,20 @@
  
  # Parsing
  
@@ -101,7 +99,7 @@ Index: diaspora/Gemfile
  gem "omniauth-wordpress", "0.2.2"
  
  # Serializers
-@@ -156,7 +156,7 @@ gem "acts-as-taggable-on", "3.5.0"
+@@ -156,7 +156,7 @@
  
  # URIs and HTTP
  
@@ -110,7 +108,7 @@ Index: diaspora/Gemfile
  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"
+@@ -167,7 +167,7 @@
  gem "gon",                     "6.0.1"
  gem "haml",                    "4.0.7"
  gem "mobile-fu",               "1.3.1"

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