[DRE-commits] [diaspora] 06/08: refresh patch modified: debian/patches/030-loosen-tiny-versions.patch

[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 4fa656e54fa4e6c347937cf7d5fec6584db340ea
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Jul 13 14:20:09 2015 +0530

    refresh patch
    	modified:   debian/patches/030-loosen-tiny-versions.patch
---
 debian/patches/030-loosen-tiny-versions.patch | 54 +++++++--------------------
 1 file changed, 13 insertions(+), 41 deletions(-)

diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
index bbce64f..e4a6cdc 100644
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ b/debian/patches/030-loosen-tiny-versions.patch
@@ -2,55 +2,27 @@ Index: diaspora/Gemfile
 ===================================================================
 --- diaspora.orig/Gemfile
 +++ diaspora/Gemfile
-@@ -32,7 +32,7 @@ gem "simple_captcha2", "0.3.4", require:
+@@ -56,7 +56,7 @@ 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"
+-gem "autoprefixer-rails", "5.1.11"
++gem "autoprefixer-rails", "~> 5.1.8"
  
- # Background processing
+ # Database
  
--gem "sidekiq", "3.3.3"
-+gem "sidekiq", "~> 3.3.3"
- gem "sinatra", "1.4.6"
- 
- # Scheduled processing
-@@ -71,7 +71,7 @@ gem "activerecord-import", "0.7.0"
- 
- gem "carrierwave", "0.10.0"
- gem "fog",         "1.28.0"
--gem "mini_magick", "4.2.0"
-+gem "mini_magick", "~> 4.2.0"
- gem "remotipart",  "1.2.1"
- 
- # GUID generation
-@@ -92,7 +92,7 @@ gem "js-routes",
- source "https://rails-assets.org" do
-   gem "rails-assets-jquery",                              "1.11.1" # Should be kept in sync with jquery-rails
- 
--  gem "rails-assets-markdown-it",                         "4.2.0"
-+  gem "rails-assets-markdown-it",                         "~> 4.2.0"
-   gem "rails-assets-markdown-it-hashtag",                 "0.3.0"
-   gem "rails-assets-markdown-it-diaspora-mention",        "0.3.0"
-   gem "rails-assets-markdown-it-sanitizer",               "0.3.0"
-@@ -123,7 +123,7 @@ gem "messagebus_ruby_api", ">=1.0.3"
- # Parsing
- 
- gem "nokogiri",          "1.6.6.2"
--gem "redcarpet",         "3.2.3"
-+gem "redcarpet",         "~> 3.2.0"
- gem "twitter-text",      "1.11.0"
- gem "roxml",             "~> 3.1"
- gem "ruby-oembed",       "0.8.12"
-@@ -152,16 +152,16 @@ gem "acts-as-taggable-on", "3.5.0"
+@@ -157,8 +157,8 @@ gem "acts-as-taggable-on", "3.5.0"
  
  # URIs and HTTP
  
--gem "addressable",        "2.3.7", require: "addressable/uri"
+-gem "addressable",        "2.3.8", require: "addressable/uri"
 -gem "faraday",            "0.9.1"
 +gem "addressable",        "~> 2.3.6", require: "addressable/uri"
 +gem "faraday",            "~> 0.9.0"
  gem "faraday_middleware", "0.9.1"
  gem "faraday-cookie_jar", "0.0.6"
--gem "typhoeus",           "0.7.1"
-+gem "typhoeus",           "~> 0.7.1"
- 
+ gem "typhoeus",           "0.7.1"
+@@ -166,7 +166,7 @@ gem "typhoeus",           "0.7.1"
  # Views
  
  gem "gon",                     "5.2.3"
@@ -59,7 +31,7 @@ Index: diaspora/Gemfile
  gem "mobile-fu",               "1.3.1"
  gem "will_paginate",           "3.0.7"
  gem "rails-timeago",           "~>2.11"
-@@ -196,7 +196,7 @@ group :production do # we don"t install
+@@ -205,7 +205,7 @@ group :production do # we don"t install
  
    # Click-jacking protection
  
@@ -68,7 +40,7 @@ Index: diaspora/Gemfile
  
    # Process management
  
-@@ -204,7 +204,7 @@ group :production do # we don"t install
+@@ -213,7 +213,7 @@ group :production do # we don"t install
  
    # Redirects
  

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