[DRE-commits] [diaspora] 05/05: loosen pg tiny version

[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 94c35ebcca40ac922223f8f57f5fda25a7fcdca2
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Aug 2 13:37:56 2015 +0530

    loosen pg tiny version
---
 debian/patches/030-loosen-tiny-versions.patch | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
index 4756822..de92ddf 100644
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ b/debian/patches/030-loosen-tiny-versions.patch
@@ -11,7 +11,7 @@ Index: diaspora/Gemfile
  gem "sinatra", "1.4.6"
  
  # Scheduled processing
-@@ -55,7 +55,7 @@ gem "rack-cors", "0.4.0", require: "rack
+@@ -55,14 +55,14 @@ gem "rack-cors", "0.4.0", require: "rack
  gem "bootstrap-sass", "2.3.2.2"
  gem "compass-rails",  "2.0.4"
  gem "sass-rails",     "5.0.1"
@@ -20,6 +20,14 @@ Index: diaspora/Gemfile
  
  # Database
  
+ ENV["DB"] ||= "mysql"
+ 
+ gem "mysql2", "0.3.18" if ENV["DB"] == "all" || ENV["DB"] == "mysql"
+-gem "pg",     "0.18.2" if ENV["DB"] == "all" || ENV["DB"] == "postgres"
++gem "pg",     "~> 0.18.1" if ENV["DB"] == "all" || ENV["DB"] == "postgres"
+ 
+ gem "activerecord-import", "0.8.0"
+ 
 @@ -82,7 +82,7 @@ gem "entypo-rails", "~> 2.2.2"
  
  # JavaScript

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