[DRE-commits] [diaspora] 01/02: relax dependency versions to prepare for 0.5.7

[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 8cd108a9d1acfa6964b9e69036bc2f38c88dd156
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Mar 3 23:08:16 2016 +0530

    relax dependency versions to prepare for 0.5.7
---
 debian/patches/050-relax-stable-libs.patch         | 51 ++++++++++++++++++++++
 .../patches/051-relax-patch-release-versions.patch | 24 ++++++++++
 debian/patches/series                              |  2 +
 3 files changed, 77 insertions(+)

diff --git a/debian/patches/050-relax-stable-libs.patch b/debian/patches/050-relax-stable-libs.patch
new file mode 100644
index 0000000..bc1e7a3
--- /dev/null
+++ b/debian/patches/050-relax-stable-libs.patch
@@ -0,0 +1,51 @@
+minor versions of stable libraries can be relaxed
+
+Index: diaspora/Gemfile
+===================================================================
+--- diaspora.orig/Gemfile
++++ diaspora/Gemfile
+@@ -18,7 +18,7 @@ gem "diaspora_federation-rails", "0.0.8"
+ 
+ gem "acts_as_api", "0.4.2"
+ gem "json",        "1.8.3"
+-gem "json-schema", "2.5.1"
++gem "json-schema", "~> 2.5"
+ 
+ # Authentication
+ 
+@@ -56,7 +56,7 @@ gem "rack-cors", "0.4.0", require: "rack
+ 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.3"
+-gem "autoprefixer-rails", "6.0.3"
++gem "autoprefixer-rails", "~> 6.0"
+ 
+ # Database
+ 
+@@ -105,7 +105,7 @@ source "https://rails-assets.org" do
+   # jQuery plugins
+ 
+   gem "rails-assets-jeresig--jquery.hotkeys",       "0.2.0"
+-  gem "rails-assets-jquery-placeholder",            "2.1.3"
++  gem "rails-assets-jquery-placeholder",            "~> 2.1"
+   gem "rails-assets-jquery-textchange",             "0.2.3"
+   gem "rails-assets-perfect-scrollbar",             "0.6.7"
+   gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11"
+@@ -126,7 +126,7 @@ gem "messagebus_ruby_api", "1.0.3"
+ 
+ # Parsing
+ 
+-gem "nokogiri",          "1.6.7.1"
++gem "nokogiri",          "~> 1.6"
+ gem "redcarpet",         "3.3.3"
+ gem "twitter-text",      "1.13.0"
+ gem "roxml",             "~> 3.1"
+@@ -135,7 +135,7 @@ gem "open_graph_reader", "0.6.1"
+ 
+ # Services
+ 
+-gem "omniauth",           "1.2.2"
++gem "omniauth",           "~> 1.2"
+ gem "omniauth-facebook",  "3.0.0"
+ gem "omniauth-tumblr",    "1.1"
+ gem "omniauth-twitter",   "1.2.1"
diff --git a/debian/patches/051-relax-patch-release-versions.patch b/debian/patches/051-relax-patch-release-versions.patch
new file mode 100644
index 0000000..f6e429e
--- /dev/null
+++ b/debian/patches/051-relax-patch-release-versions.patch
@@ -0,0 +1,24 @@
+relaxing patch releases required for newer diaspora versions
+
+Index: diaspora/Gemfile
+===================================================================
+--- diaspora.orig/Gemfile
++++ diaspora/Gemfile
+@@ -22,7 +22,7 @@ gem "json-schema", "2.5.1"
+ 
+ # Authentication
+ 
+-gem "devise", "3.5.2"
++gem "devise", "~> 3.5.2"
+ gem "devise_lastseenable", "0.0.6"
+ gem "devise-token_authenticatable", "~> 0.4.0"
+ 
+@@ -33,7 +33,7 @@ gem "simple_captcha2", "0.3.4", require:
+ # Background processing
+ 
+ gem "sidekiq", "4.0.1"
+-gem "sinatra", "1.4.6"
++gem "sinatra", "~> 1.4.6"
+ 
+ # Scheduled processing
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e6554d6..3edc2a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,5 @@
 043-dont-do-git-checks.patch
 044-work-around-sprockets3.patch
 045-replace-sidetiq.patch
+050-relax-stable-libs.patch
+051-relax-patch-release-versions.patch

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