[DRE-commits] [diaspora] 02/03: pg 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 e3b3ffbdb5ace8dfb1c5f47870ad21755acb5c23
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Aug 29 22:21:46 2015 +0530

    pg is in sync
---
 debian/changelog                              |  2 +-
 debian/control                                |  2 +-
 debian/patches/030-loosen-tiny-versions.patch | 10 +---------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4aa2a1c..1a891f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ diaspora (0.5.2.0+debian-7) UNRELEASED; urgency=medium
     ruby-rack-rewrite, ruby-uuid, ruby-mini-magick, ruby-rack-protection,
     ruby-rails-admin, ruby-zip, ruby-haml, ruby-typhoeus, ruby-faraday,
     ruby-addressable, ruby-rails-assets-jquery-placeholder, ruby-js-routes,
-    ruby-handlebars-assets
+    ruby-handlebars-assets, ruby-pg
   * Add ruby-responders, ruby-jquery-ui-rails to dependencies
 
  -- Pirate Praveen <praveen at debian.org>  Fri, 28 Aug 2015 14:52:07 +0530
diff --git a/debian/control b/debian/control
index b925a1d..c69a725 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-configurate (>= 0.2.0~),
  ruby-rack-cors,
  ruby-mysql2,
- ruby-pg,
+ ruby-pg (>= 0.18.2),
  ruby-activerecord-import,
  ruby-foreigner,
  ruby-carrierwave (>= 0.10~),
diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
index 26873c7..b7d27b6 100644
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ b/debian/patches/030-loosen-tiny-versions.patch
@@ -20,7 +20,7 @@ Index: diaspora/Gemfile
  gem "sinatra", "1.4.6"
  
  # Scheduled processing
-@@ -53,16 +53,16 @@ gem "rack-cors", "0.4.0", require: "rack
+@@ -53,9 +53,9 @@ gem "rack-cors", "0.4.0", require: "rack
  # CSS
  
  gem "bootstrap-sass", "2.3.2.2"
@@ -33,14 +33,6 @@ 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.3"
  
  # JavaScript

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