[DRE-commits] [diaspora] 01/01: relax pg and unicorn

[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 a079d64da27f1e5867c92419fc6b5f429fa872b5
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Mar 17 14:37:01 2016 +0530

    relax pg and unicorn
---
 debian/patches/050-relax-stable-libs.patch            | 7 ++++++-
 debian/patches/051-relax-patch-release-versions.patch | 9 +++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/debian/patches/050-relax-stable-libs.patch b/debian/patches/050-relax-stable-libs.patch
index eee8958..ea6a209 100644
--- a/debian/patches/050-relax-stable-libs.patch
+++ b/debian/patches/050-relax-stable-libs.patch
@@ -4,7 +4,7 @@ Index: diaspora/Gemfile
 ===================================================================
 --- diaspora.orig/Gemfile
 +++ diaspora/Gemfile
-@@ -4,7 +4,7 @@ gem "rails", "~> 4.2.5"
+@@ -4,11 +4,11 @@ gem "rails", "~> 4.2.5"
  
  # Legacy Rails features, remove me!
  # responders (class level)
@@ -13,6 +13,11 @@ Index: diaspora/Gemfile
  
  # Appserver
  
+-gem "unicorn", "5.0.1", require: false
++gem "unicorn", ">= 4.9", require: false
+ 
+ # Federation
+ 
 @@ -18,7 +18,7 @@ gem "diaspora_federation-rails", "0.0.12
  
  gem "acts_as_api", "0.4.2"
diff --git a/debian/patches/051-relax-patch-release-versions.patch b/debian/patches/051-relax-patch-release-versions.patch
index e5e4e2b..b31717a 100644
--- a/debian/patches/051-relax-patch-release-versions.patch
+++ b/debian/patches/051-relax-patch-release-versions.patch
@@ -22,3 +22,12 @@ Index: diaspora/Gemfile
  
  # Scheduled processing
  
+@@ -63,7 +63,7 @@ gem "autoprefixer-rails", "~> 6.3", ">=
+ ENV["DB"] ||= "mysql"
+ 
+ gem "mysql2", "0.4.2" if ENV["DB"] == "all" || ENV["DB"] == "mysql"
+-gem "pg",     "0.18.4" if ENV["DB"] == "all" || ENV["DB"] == "postgres"
++gem "pg",     "~> 0.18.4" if ENV["DB"] == "all" || ENV["DB"] == "postgres"
+ 
+ gem "activerecord-import", "0.11.0"
+ 

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