[DRE-commits] [diaspora] 09/11: 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 cd90684abeee7a8c9b2d3486402967cf83c39237
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Jul 28 17:06:37 2015 +0530

    refresh patch
    	modified:   debian/patches/030-loosen-tiny-versions.patch
---
 debian/patches/030-loosen-tiny-versions.patch | 43 ++++++++-------------------
 1 file changed, 12 insertions(+), 31 deletions(-)

diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
index c2c790f..ab4e525 100644
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ b/debian/patches/030-loosen-tiny-versions.patch
@@ -2,35 +2,16 @@ Index: diaspora/Gemfile
 ===================================================================
 --- diaspora.orig/Gemfile
 +++ diaspora/Gemfile
-@@ -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"
- 
- # Database
- 
-@@ -83,15 +83,15 @@ gem "entypo-rails", "~> 2.2.2"
+@@ -82,7 +82,7 @@ gem "entypo-rails", "~> 2.2.2"
  
  # JavaScript
  
--gem "backbone-on-rails",                                "1.1.2.1"
-+gem "backbone-on-rails",                                "~> 1.1.2"
- gem "handlebars_assets",                                "0.20.1"
- gem "jquery-rails",                                     "4.0.4"
- gem "jquery-ui-rails",                                  "5.0.3"
- gem "js_image_paths",                                   "0.0.2"
--gem "js-routes",                                        "1.0.1"
-+gem "js-routes",                                        "~> 1.0.0"
- 
- 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-markdown-it",                         "4.2.1"
-   gem "rails-assets-markdown-it-hashtag",                 "0.3.1"
-@@ -157,8 +157,8 @@ gem "acts-as-taggable-on", "3.5.0"
+-gem "backbone-on-rails", "1.1.2.1"
++gem "backbone-on-rails", "~> 1.1.2"
+ gem "handlebars_assets", "0.20.2"
+ gem "jquery-rails",      "4.0.4"
+ gem "jquery-ui-rails",   "5.0.5"
+@@ -155,8 +155,8 @@ gem "acts-as-taggable-on", "3.5.0"
  
  # URIs and HTTP
  
@@ -40,8 +21,8 @@ Index: diaspora/Gemfile
 +gem "faraday",            "~> 0.9.0"
  gem "faraday_middleware", "0.9.1"
  gem "faraday-cookie_jar", "0.0.6"
- gem "typhoeus",           "0.7.1"
-@@ -166,7 +166,7 @@ gem "typhoeus",           "0.7.1"
+ gem "typhoeus",           "0.7.2"
+@@ -164,7 +164,7 @@ gem "typhoeus",           "0.7.2"
  # Views
  
  gem "gon",                     "5.2.3"
@@ -50,7 +31,7 @@ Index: diaspora/Gemfile
  gem "mobile-fu",               "1.3.1"
  gem "will_paginate",           "3.0.7"
  gem "rails-timeago",           "~>2.11"
-@@ -177,7 +177,7 @@ gem "logging-rails", "0.5.0", require: "
+@@ -175,7 +175,7 @@ gem "logging-rails", "0.5.0", require: "
  
  # Reading and writing zip files
  
@@ -59,7 +40,7 @@ Index: diaspora/Gemfile
  
  # Prevent occasions where minitest is not bundled in
  # packaged versions of ruby. See following issues/prs:
-@@ -205,7 +205,7 @@ group :production do # we don"t install
+@@ -203,7 +203,7 @@ group :production do # we don"t install
  
    # Click-jacking protection
  
@@ -68,7 +49,7 @@ Index: diaspora/Gemfile
  
    # Process management
  
-@@ -213,7 +213,7 @@ group :production do # we don"t install
+@@ -211,7 +211,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