[DRE-commits] [diaspora] 08/11: refresh patches

[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 9b5b766a3a608b5a245823633718379be3a8b804
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Jul 28 16:20:41 2015 +0530

    refresh patches
---
 debian/patches/020-loosen-minor-versions.patch | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/debian/patches/020-loosen-minor-versions.patch b/debian/patches/020-loosen-minor-versions.patch
index f1d2886..9589047 100644
--- a/debian/patches/020-loosen-minor-versions.patch
+++ b/debian/patches/020-loosen-minor-versions.patch
@@ -2,16 +2,16 @@ Index: diaspora/Gemfile
 ===================================================================
 --- diaspora.orig/Gemfile
 +++ diaspora/Gemfile
-@@ -13,7 +13,7 @@ gem "responders", "~> 2.0"
+@@ -8,7 +8,7 @@ gem "responders", "~> 2.0"
  
  # Appserver
  
 -gem "unicorn", "4.9.0", require: false
 +gem "unicorn", "~> 4.8", require: false
  
- # API and JSON
+ # Federation
  
-@@ -79,7 +79,7 @@ gem "uuid", "2.3.7"
+@@ -78,7 +78,7 @@ gem "uuid", "2.3.8"
  
  # Icons
  
@@ -20,25 +20,7 @@ Index: diaspora/Gemfile
  
  # JavaScript
  
-@@ -100,7 +100,7 @@ source "https://rails-assets.org" do
-   gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.1"
-   gem "rails-assets-markdown-it-sub",                     "1.0.0"
-   gem "rails-assets-markdown-it-sup",                     "1.0.0"
--  gem "rails-assets-highlightjs",                         "8.5.0"
-+  gem "rails-assets-highlightjs",                         "~> 8.5"
- 
-   # jQuery plugins
- 
-@@ -129,7 +129,7 @@ gem "messagebus_ruby_api", ">=1.0.3"
- 
- gem "nokogiri",          "1.6.6.2"
- gem "redcarpet",         "3.2.3"
--gem "twitter-text",      "1.12.0"
-+gem "twitter-text",      "~> 1.11"
- gem "roxml",             "~> 3.1"
- gem "ruby-oembed",       "0.8.14"
- gem "open_graph_reader", "0.6.1"
-@@ -209,7 +209,7 @@ group :production do # we don"t install
+@@ -207,7 +207,7 @@ group :production do # we don"t install
  
    # Process management
  

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