[DRE-commits] [diaspora] 03/03: refresh patches
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Sat Mar 12 06:24:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository diaspora.
commit 980716b8ff72ade042b2786946f1a3c6bc30af84
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Sat Mar 12 11:53:59 2016 +0530
refresh patches
---
debian/changelog | 1 +
.../002-remove-development-test-from-gemfile.patch | 30 ++++-----
debian/patches/007-loosen-roxml-version.patch | 10 +--
debian/patches/008-add-colorbox.patch | 24 --------
debian/patches/019-remove-diaspora-vines.patch | 13 ----
debian/patches/030-loosen-tiny-versions.patch | 16 ++---
debian/patches/031-embedded-gems.patch | 4 +-
debian/patches/032-relax-omniauth-facebook.patch | 25 --------
debian/patches/033-relax-rails-minor-version.patch | 2 +-
debian/patches/044-work-around-sprockets3.patch | 4 +-
debian/patches/045-replace-sidetiq.patch | 57 +++++++++--------
debian/patches/050-relax-stable-libs.patch | 72 +++++++++++-----------
.../patches/051-relax-patch-release-versions.patch | 14 ++---
debian/patches/series | 3 -
14 files changed, 106 insertions(+), 169 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6d4b3b2..2a2d45d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
diaspora (0.5.7.1+debian-1) UNRELEASED; urgency=medium
* New upstream release
+ * Refresh patches
-- Pirate Praveen <praveen at debian.org> Sat, 12 Mar 2016 11:21:35 +0530
diff --git a/debian/patches/002-remove-development-test-from-gemfile.patch b/debian/patches/002-remove-development-test-from-gemfile.patch
index 8c09fdf..881a001 100644
--- a/debian/patches/002-remove-development-test-from-gemfile.patch
+++ b/debian/patches/002-remove-development-test-from-gemfile.patch
@@ -2,7 +2,7 @@ Index: diaspora/Gemfile
===================================================================
--- diaspora.orig/Gemfile
+++ diaspora/Gemfile
-@@ -219,71 +219,3 @@ group :production do # we don"t install
+@@ -219,73 +219,3 @@ group :production do # we don"t install
gem "asset_sync", "1.1.0", require: false
end
@@ -14,16 +14,16 @@ Index: diaspora/Gemfile
- gem "guard-rspec", "4.6.4"
- gem "guard-rubocop", "1.2.0"
- gem "guard", "2.13.0", require: false
-- gem "rb-fsevent", "0.9.6", require: false
-- gem "rb-inotify", "0.9.5", require: false
+- gem "rb-fsevent", "0.9.7", require: false
+- gem "rb-inotify", "0.9.7", require: false
-
- # Linters
- gem "jshintrb", "0.3.0"
-- gem "rubocop", "0.34.2"
+- gem "rubocop", "0.35.1"
-
- # Preloading environment
-
-- gem "spring", "1.4.0"
+- gem "spring", "1.6.3"
- gem "spring-commands-rspec", "1.0.4"
- gem "spring-commands-cucumber", "1.0.1"
-
@@ -33,7 +33,7 @@ Index: diaspora/Gemfile
- gem "pry-byebug"
-
- # test coverage
-- gem "simplecov", "0.10.0", require: false
+- gem "simplecov", "0.11.2", require: false
-end
-
-group :test do
@@ -42,31 +42,33 @@ Index: diaspora/Gemfile
- gem "fixture_builder", "0.4.1"
- gem "fuubar", "2.0.0"
- gem "rspec-instafail", "0.4.0", require: false
-- gem "test_after_commit", "0.4.1"
+- gem "test_after_commit", "0.4.2"
-
- # Cucumber (integration tests)
-
-- gem "capybara", "2.5.0"
+- gem "capybara", "2.6.2"
- gem "database_cleaner" , "1.5.1"
- gem "selenium-webdriver", "2.47.1"
-
- # General helpers
-
-- gem "factory_girl_rails", "4.5.0"
+- gem "factory_girl_rails", "4.6.0"
- gem "timecop", "0.8.0"
-- gem "webmock", "1.22.1", require: false
-- gem "shoulda-matchers", "3.0.0"
+- gem "webmock", "1.22.6", require: false
+- gem "shoulda-matchers", "3.1.1"
+-
+- gem "diaspora_federation-test", "0.0.12"
-end
-
-group :development, :test do
- # RSpec (unit tests, some integration tests)
-- gem "rspec-rails", "3.3.3"
+- gem "rspec-rails", "3.4.2"
-
- # Cucumber (integration tests)
-- gem "cucumber-rails", "1.4.2", require: false
+- gem "cucumber-rails", "1.4.3", require: false
-
- # Jasmine (client side application tests (JS))
-- gem "jasmine", "2.3.1"
+- gem "jasmine", "2.4.0"
- gem "jasmine-jquery-rails", "2.0.3"
- gem "rails-assets-jasmine-ajax", "3.2.0", source: "https://rails-assets.org"
- gem "sinon-rails", "1.15.0"
diff --git a/debian/patches/007-loosen-roxml-version.patch b/debian/patches/007-loosen-roxml-version.patch
index a308df5..a897664 100644
--- a/debian/patches/007-loosen-roxml-version.patch
+++ b/debian/patches/007-loosen-roxml-version.patch
@@ -3,11 +3,11 @@ Index: diaspora/Gemfile
--- diaspora.orig/Gemfile
+++ diaspora/Gemfile
@@ -129,7 +129,7 @@ gem "messagebus_ruby_api", "1.0.3"
- gem "nokogiri", "1.6.7.1"
- gem "redcarpet", "3.3.3"
- gem "twitter-text", "1.13.0"
+ gem "nokogiri", "1.6.7.2"
+ gem "redcarpet", "3.3.4"
+ gem "twitter-text", "1.13.3"
-gem "roxml", "3.1.6"
-+gem "roxml", "~> 3.1"
- gem "ruby-oembed", "0.8.14"
++gem "roxml", "~> 3.1", ">= 3.1.6"
+ gem "ruby-oembed", "0.9.0"
gem "open_graph_reader", "0.6.1"
diff --git a/debian/patches/008-add-colorbox.patch b/debian/patches/008-add-colorbox.patch
deleted file mode 100644
index e630100..0000000
--- a/debian/patches/008-add-colorbox.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: diaspora/Gemfile
-===================================================================
---- diaspora.orig/Gemfile
-+++ diaspora/Gemfile
-@@ -149,6 +149,7 @@ gem "active_model_serializers", "0.9.3"
- # XMPP chat dependencies
- gem "diaspora-vines", "~> 0.2.0.develop"
- gem "rails-assets-diaspora_jsxc", "~> 0.1.4.alpha", "< 0.1.4.develop", source: "https://rails-assets.org"
-+gem "rails-assets-colorbox", "~> 1.6.3"
-
- # Tags
-
-Index: diaspora/app/assets/stylesheets/application.scss
-===================================================================
---- diaspora.orig/app/assets/stylesheets/application.scss
-+++ diaspora/app/assets/stylesheets/application.scss
-@@ -77,7 +77,6 @@
- @import 'stream';
- @import 'stream_element';
- @import 'comments';
-- at import 'colorbox';
- @import 'diaspora_jsxc';
- @import 'chat';
- @import 'markdown-content';
diff --git a/debian/patches/019-remove-diaspora-vines.patch b/debian/patches/019-remove-diaspora-vines.patch
deleted file mode 100644
index e9b2645..0000000
--- a/debian/patches/019-remove-diaspora-vines.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: diaspora/Gemfile
-===================================================================
---- diaspora.orig/Gemfile
-+++ diaspora/Gemfile
-@@ -147,7 +147,7 @@ gem "omniauth-wordpress", "0.2.2"
- gem "active_model_serializers", "0.9.3"
-
- # XMPP chat dependencies
--gem "diaspora-vines", "~> 0.2.0.develop"
-+#gem "diaspora-vines", "~> 0.2.0.develop"
- gem "rails-assets-diaspora_jsxc", "~> 0.1.4.alpha", "< 0.1.4.develop", source: "https://rails-assets.org"
- gem "rails-assets-colorbox", "~> 1.6.3"
-
diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
index 40039e7..5a185cd 100644
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ b/debian/patches/030-loosen-tiny-versions.patch
@@ -7,23 +7,23 @@ Index: diaspora/Gemfile
gem "bootstrap-sass", "2.3.2.2"
gem "compass-rails", "2.0.5"
-gem "sass-rails", "5.0.4"
-+gem "sass-rails", "5.0.3"
- gem "autoprefixer-rails", "6.0.3"
++gem "sass-rails", "~> 5.0"
+ gem "autoprefixer-rails", "6.3.1"
# Database
@@ -91,7 +91,7 @@ gem "js_image_paths", "0.0.2"
- gem "js-routes", "1.1.2"
+ gem "js-routes", "1.2.3"
source "https://rails-assets.org" do
-- gem "rails-assets-jquery", "1.11.2" # Should be kept in sync with jquery-rails
-+ gem "rails-assets-jquery", "~> 1.11.1" # Should be kept in sync with jquery-rails
+- gem "rails-assets-jquery", "1.12.0" # Should be kept in sync with jquery-rails
++ gem "rails-assets-jquery", "1.11.1" # Should be kept in sync with jquery-rails
- gem "rails-assets-markdown-it", "5.0.2"
+ gem "rails-assets-markdown-it", "6.0.0"
gem "rails-assets-markdown-it-hashtag", "0.4.0"
-@@ -169,7 +169,7 @@ gem "gon", "6.0.1"
+@@ -168,7 +168,7 @@ gem "gon", "6.0.1"
gem "haml", "4.0.7"
gem "mobile-fu", "1.3.1"
- gem "will_paginate", "3.0.7"
+ gem "will_paginate", "3.1.0"
-gem "rails-timeago", "2.11.0"
+gem "rails-timeago", "~> 2.11.0"
diff --git a/debian/patches/031-embedded-gems.patch b/debian/patches/031-embedded-gems.patch
index 7c720d2..b65fed1 100644
--- a/debian/patches/031-embedded-gems.patch
+++ b/debian/patches/031-embedded-gems.patch
@@ -9,5 +9,5 @@ Index: diaspora/Gemfile
-gem "bootstrap-sass", "2.3.2.2"
+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 "sass-rails", "~> 5.0"
+ gem "autoprefixer-rails", "6.3.1"
diff --git a/debian/patches/032-relax-omniauth-facebook.patch b/debian/patches/032-relax-omniauth-facebook.patch
deleted file mode 100644
index 2e87985..0000000
--- a/debian/patches/032-relax-omniauth-facebook.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a6e3d587b65dad034d5cda75e6cb169699313489 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me at jhass.eu>
-Date: Thu, 10 Dec 2015 18:12:57 +0100
-Subject: [PATCH] bump omniauth-facebook
-
----
- Gemfile | 2 +-
- Gemfile.lock | 10 +++++-----
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-Bug: https://github.com/diaspora/diaspora/pull/6600
-
-Index: diaspora/Gemfile
-===================================================================
---- diaspora.orig/Gemfile
-+++ diaspora/Gemfile
-@@ -136,7 +136,7 @@ gem "open_graph_reader", "0.6.1"
- # Services
-
- gem "omniauth", "1.2.2"
--gem "omniauth-facebook", "2.0.1"
-+gem "omniauth-facebook", "3.0.0"
- gem "omniauth-tumblr", "1.1"
- gem "omniauth-twitter", "1.2.1"
- gem "twitter", "5.15.0"
diff --git a/debian/patches/033-relax-rails-minor-version.patch b/debian/patches/033-relax-rails-minor-version.patch
index 85bc4d7..4638115 100644
--- a/debian/patches/033-relax-rails-minor-version.patch
+++ b/debian/patches/033-relax-rails-minor-version.patch
@@ -5,7 +5,7 @@ Index: diaspora/Gemfile
@@ -1,6 +1,6 @@
source "https://rubygems.org"
--gem "rails", "4.2.5"
+-gem "rails", "4.2.5.1"
+gem "rails", "~> 4.2.5"
# Legacy Rails features, remove me!
diff --git a/debian/patches/044-work-around-sprockets3.patch b/debian/patches/044-work-around-sprockets3.patch
index f7098ac..8b33257 100644
--- a/debian/patches/044-work-around-sprockets3.patch
+++ b/debian/patches/044-work-around-sprockets3.patch
@@ -5,8 +5,8 @@ Index: diaspora/app/assets/javascripts/jsxc.js
--- diaspora.orig/app/assets/javascripts/jsxc.js
+++ diaspora/app/assets/javascripts/jsxc.js
@@ -1,6 +1,6 @@
- //= require jquery.slimscroll
- //= require colorbox
+ //= require jquery.slimscroll/jquery.slimscroll
+ //= require jquery-colorbox
-//= require favico.js
+//= require favico.js/favico.js
//= require jquery-fullscreen-plugin
diff --git a/debian/patches/045-replace-sidetiq.patch b/debian/patches/045-replace-sidetiq.patch
index bb4c40d..3e1bfd9 100644
--- a/debian/patches/045-replace-sidetiq.patch
+++ b/debian/patches/045-replace-sidetiq.patch
@@ -13,17 +13,17 @@ Subject: [PATCH] Replace sidetiq with sidekiq-cron
8 files changed, 36 insertions(+), 29 deletions(-)
create mode 100644 config/schedule.yml
-diff --git a/Gemfile b/Gemfile
-index 67cf53b..5a77859 100644
---- a/Gemfile
-+++ b/Gemfile
-@@ -32,12 +32,12 @@ gem "simple_captcha2", "0.3.4", require: "simple_captcha"
+Index: diaspora/Gemfile
+===================================================================
+--- diaspora.orig/Gemfile
++++ diaspora/Gemfile
+@@ -32,12 +32,12 @@ gem "simple_captcha2", "0.4.0", require:
# Background processing
-gem "sidekiq", "3.4.2"
-+gem "sidekiq", "4.0.1"
- gem "sinatra", "1.4.6"
++gem "sidekiq", "~> 4.0"
+ gem "sinatra", "1.4.7"
# Scheduled processing
@@ -32,10 +32,10 @@ index 67cf53b..5a77859 100644
# Compression
-diff --git a/app/workers/clean_cached_files.rb b/app/workers/clean_cached_files.rb
-index 3497803..3e20e4a 100644
---- a/app/workers/clean_cached_files.rb
-+++ b/app/workers/clean_cached_files.rb
+Index: diaspora/app/workers/clean_cached_files.rb
+===================================================================
+--- diaspora.orig/app/workers/clean_cached_files.rb
++++ diaspora/app/workers/clean_cached_files.rb
@@ -1,13 +1,9 @@
module Workers
class CleanCachedFiles < Base
@@ -51,10 +51,10 @@ index 3497803..3e20e4a 100644
- end
+ end
end
-diff --git a/app/workers/queue_users_for_removal.rb b/app/workers/queue_users_for_removal.rb
-index b9565f7..bfe3a4e 100644
---- a/app/workers/queue_users_for_removal.rb
-+++ b/app/workers/queue_users_for_removal.rb
+Index: diaspora/app/workers/queue_users_for_removal.rb
+===================================================================
+--- diaspora.orig/app/workers/queue_users_for_removal.rb
++++ diaspora/app/workers/queue_users_for_removal.rb
@@ -4,12 +4,8 @@
module Workers
@@ -69,18 +69,18 @@ index b9565f7..bfe3a4e 100644
def perform
# Queue users for removal due to inactivity
if AppConfig.settings.maintenance.remove_old_users.enable?
-@@ -37,5 +33,5 @@ def perform
+@@ -37,5 +33,5 @@ module Workers
end
end
end
- end
+ end
end
-diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
-index 9709cc2..fa5ed37 100644
---- a/config/initializers/sidekiq.rb
-+++ b/config/initializers/sidekiq.rb
-@@ -52,3 +52,9 @@ def context
+Index: diaspora/config/initializers/sidekiq.rb
+===================================================================
+--- diaspora.orig/config/initializers/sidekiq.rb
++++ diaspora/config/initializers/sidekiq.rb
+@@ -52,3 +52,9 @@ end
Sidekiq.configure_client do |config|
config.redis = AppConfig.get_redis_options
end
@@ -90,10 +90,10 @@ index 9709cc2..fa5ed37 100644
+if File.exist?(schedule_file) && Sidekiq.server?
+ Sidekiq::Cron::Job.load_from_hash YAML.load_file(schedule_file)
+end
-diff --git a/config/routes.rb b/config/routes.rb
-index 4babaf6..45c7721 100644
---- a/config/routes.rb
-+++ b/config/routes.rb
+Index: diaspora/config/routes.rb
+===================================================================
+--- diaspora.orig/config/routes.rb
++++ diaspora/config/routes.rb
@@ -3,7 +3,7 @@
# the COPYRIGHT file.
@@ -103,11 +103,10 @@ index 4babaf6..45c7721 100644
Diaspora::Application.routes.draw do
-diff --git a/config/schedule.yml b/config/schedule.yml
-new file mode 100644
-index 0000000..1407cfd
+Index: diaspora/config/schedule.yml
+===================================================================
--- /dev/null
-+++ b/config/schedule.yml
++++ diaspora/config/schedule.yml
@@ -0,0 +1,14 @@
+clean_cached_files:
+ cron: "0 0 * * *"
diff --git a/debian/patches/050-relax-stable-libs.patch b/debian/patches/050-relax-stable-libs.patch
index 32a8542..e66a14e 100644
--- a/debian/patches/050-relax-stable-libs.patch
+++ b/debian/patches/050-relax-stable-libs.patch
@@ -4,57 +4,57 @@ Index: diaspora/Gemfile
===================================================================
--- diaspora.orig/Gemfile
+++ diaspora/Gemfile
-@@ -18,7 +18,7 @@ gem "diaspora_federation-rails", "0.0.8"
+@@ -18,7 +18,7 @@ gem "diaspora_federation-rails", "0.0.12
gem "acts_as_api", "0.4.2"
gem "json", "1.8.3"
--gem "json-schema", "2.5.1"
-+gem "json-schema", "~> 2.5", ">= 2.5.1"
+-gem "json-schema", "2.6.0"
++gem "json-schema", "~> 2.6",
# 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", ">= 6.0.3"
+ gem "sass-rails", "~> 5.0"
+-gem "autoprefixer-rails", "6.3.1"
++gem "autoprefixer-rails", "~> 6.3", ">= 6.3.1"
# Database
-@@ -71,7 +71,7 @@ gem "activerecord-import", "0.10.0"
+@@ -71,7 +71,7 @@ gem "activerecord-import", "0.11.0"
gem "carrierwave", "0.10.0"
- gem "fog", "1.34.0"
--gem "mini_magick", "4.3.6"
-+gem "mini_magick", "~> 4.3", ">= 4.3.6"
+ gem "fog", "1.37.0"
+-gem "mini_magick", "4.4.0"
++gem "mini_magick", "~> 4.4"
gem "remotipart", "1.2.1"
# GUID generation
-@@ -88,7 +88,7 @@ gem "handlebars_assets", "0.21.0"
- gem "jquery-rails", "4.0.5"
+@@ -88,7 +88,7 @@ gem "handlebars_assets", "0.23.0"
+ gem "jquery-rails", "4.1.0"
gem "jquery-ui-rails", "5.0.5"
gem "js_image_paths", "0.0.2"
--gem "js-routes", "1.1.2"
-+gem "js-routes", "~> 1.1", ">= 1.1.2"
+-gem "js-routes", "1.2.3"
++gem "js-routes", "~> 1.2"
source "https://rails-assets.org" do
- gem "rails-assets-jquery", "~> 1.11.1" # Should be kept in sync with jquery-rails
+ gem "rails-assets-jquery", "1.11.1" # Should be kept in sync with jquery-rails
@@ -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", ">= 2.1.3"
+- gem "rails-assets-jquery-placeholder", "2.3.1"
++ gem "rails-assets-jquery-placeholder", "~> 2.3", ">= 2.3.1"
gem "rails-assets-jquery-textchange", "0.2.3"
- gem "rails-assets-perfect-scrollbar", "0.6.7"
+ gem "rails-assets-perfect-scrollbar", "0.6.10"
gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11"
@@ -117,7 +117,7 @@ gem "facebox-rails", "0.2.0"
gem "http_accept_language", "2.0.5"
gem "i18n-inflector-rails", "1.0.7"
--gem "rails-i18n", "4.0.5"
-+gem "rails-i18n", "~> 4.0", ">= 4.0.5"
+-gem "rails-i18n", "4.0.8"
++gem "rails-i18n", "~> 4.0", ">= 4.0.8"
# Mail
@@ -62,34 +62,34 @@ Index: diaspora/Gemfile
# Parsing
--gem "nokogiri", "1.6.7.1"
-+gem "nokogiri", "~> 1.6", ">= 1.6.7.1"
- gem "redcarpet", "3.3.3"
--gem "twitter-text", "1.13.0"
-+gem "twitter-text", "~> 1.13"
- gem "roxml", "~> 3.1"
- gem "ruby-oembed", "0.8.14"
+-gem "nokogiri", "1.6.7.2"
++gem "nokogiri", "~> 1.6", ">= 1.6.7.2"
+ gem "redcarpet", "3.3.4"
+-gem "twitter-text", "1.13.3"
++gem "twitter-text", "~> 1.13", ">=1.13.3"
+ gem "roxml", "~> 3.1", ">= 3.1.6"
+ gem "ruby-oembed", "0.9.0"
gem "open_graph_reader", "0.6.1"
# Services
--gem "omniauth", "1.2.2"
-+gem "omniauth", "~> 1.2", ">= 1.2.2"
+-gem "omniauth", "1.3.1"
++gem "omniauth", "~> 1.3", ">= 1.3.1"
gem "omniauth-facebook", "3.0.0"
--gem "omniauth-tumblr", "1.1"
-+gem "omniauth-tumblr", "~> 1.1"
+-gem "omniauth-tumblr", "1.2"
++gem "omniauth-tumblr", "~> 1.2"
gem "omniauth-twitter", "1.2.1"
--gem "twitter", "5.15.0"
-+gem "twitter", "~> 5.15"
+-gem "twitter", "5.16.0"
++gem "twitter", "~> 5.16"
gem "omniauth-wordpress", "0.2.2"
# Serializers
-@@ -168,7 +168,7 @@ gem "typhoeus", "0.8.0"
+@@ -167,7 +167,7 @@ gem "typhoeus", "0.8.0"
gem "gon", "6.0.1"
gem "haml", "4.0.7"
gem "mobile-fu", "1.3.1"
--gem "will_paginate", "3.0.7"
-+gem "will_paginate", "~> 3.0", ">= 3.0.7"
+-gem "will_paginate", "3.1.0"
++gem "will_paginate", "~> 3.1"
gem "rails-timeago", "~> 2.11.0"
# Logging
diff --git a/debian/patches/051-relax-patch-release-versions.patch b/debian/patches/051-relax-patch-release-versions.patch
index f6e429e..e5e4e2b 100644
--- a/debian/patches/051-relax-patch-release-versions.patch
+++ b/debian/patches/051-relax-patch-release-versions.patch
@@ -4,21 +4,21 @@ 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.6",
# Authentication
--gem "devise", "3.5.2"
-+gem "devise", "~> 3.5.2"
+-gem "devise", "3.5.6"
++gem "devise", "~> 3.5.6"
gem "devise_lastseenable", "0.0.6"
gem "devise-token_authenticatable", "~> 0.4.0"
-@@ -33,7 +33,7 @@ gem "simple_captcha2", "0.3.4", require:
+@@ -33,7 +33,7 @@ gem "simple_captcha2", "0.4.0", require:
# Background processing
- gem "sidekiq", "4.0.1"
--gem "sinatra", "1.4.6"
-+gem "sinatra", "~> 1.4.6"
+ gem "sidekiq", "~> 4.0"
+-gem "sinatra", "1.4.7"
++gem "sinatra", "~> 1.4.7"
# Scheduled processing
diff --git a/debian/patches/series b/debian/patches/series
index 3edc2a0..11a5ea1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,7 @@
002-remove-development-test-from-gemfile.patch
007-loosen-roxml-version.patch
-008-add-colorbox.patch
-019-remove-diaspora-vines.patch
030-loosen-tiny-versions.patch
031-embedded-gems.patch
-032-relax-omniauth-facebook.patch
033-relax-rails-minor-version.patch
043-dont-do-git-checks.patch
044-work-around-sprockets3.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git
More information about the Pkg-ruby-extras-commits
mailing list