[DRE-commits] [diaspora] 01/01: upload to unstable

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch 0.5.5.1
in repository diaspora.

commit 5ca1b9983cbaf6b88cb3bafc2df5d702574b8318
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Mar 17 14:15:24 2016 +0530

    upload to unstable
---
 debian/changelog                                      |  6 ++++++
 debian/patches/050-relax-stable-libs.patch            |  7 ++++++-
 debian/patches/051-relax-patch-release-versions.patch | 11 ++++++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 574201e..63cf72b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+diaspora (0.5.5.1+debian-8) unstable; urgency=medium
+
+  * Relax version of pg and unicorn 
+
+ -- Pirate Praveen <praveen at debian.org>  Thu, 17 Mar 2016 14:15:19 +0530
+
 diaspora (0.5.5.1+debian-7) unstable; urgency=medium
 
   * Allow ruby-autoprefixer-rails >= 6.1
diff --git a/debian/patches/050-relax-stable-libs.patch b/debian/patches/050-relax-stable-libs.patch
index 27c1714..b2cb9c0 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", "4.9.0", require: false
++gem "unicorn", ">= 4.9.0", require: false
+ 
+ # Federation
+ 
 @@ -18,7 +18,7 @@ gem "diaspora_federation-rails", "0.0.8"
  
  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 f6e429e..490c0a4 100644
--- a/debian/patches/051-relax-patch-release-versions.patch
+++ b/debian/patches/051-relax-patch-release-versions.patch
@@ -4,7 +4,7 @@ Index: diaspora/Gemfile
 ===================================================================
 --- diaspora.orig/Gemfile
 +++ diaspora/Gemfile
-@@ -22,7 +22,7 @@ gem "json-schema", "2.5.1"
+@@ -22,7 +22,7 @@ gem "json-schema", "~> 2.5"
  
  # Authentication
  
@@ -22,3 +22,12 @@ Index: diaspora/Gemfile
  
  # Scheduled processing
  
+@@ -63,7 +63,7 @@ gem "autoprefixer-rails", "~> 6.0"
+ ENV["DB"] ||= "mysql"
+ 
+ gem "mysql2", "0.3.20" if ENV["DB"] == "all" || ENV["DB"] == "mysql"
+-gem "pg",     "0.18.3" if ENV["DB"] == "all" || ENV["DB"] == "postgres"
++gem "pg",     "~> 0.18.3" if ENV["DB"] == "all" || ENV["DB"] == "postgres"
+ 
+ gem "activerecord-import", "0.10.0"
+ 

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