[DRE-commits] [diaspora] 05/09: 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 c1beb2a5efbd0163dc1930c274e3d4527e4c0f2d
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Sep 17 04:47:47 2015 +0530

    refresh patches
---
 debian/patches/019-remove-diaspora-vines.patch | 6 +++---
 debian/patches/030-loosen-tiny-versions.patch  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/patches/019-remove-diaspora-vines.patch b/debian/patches/019-remove-diaspora-vines.patch
index bd32c9a..71a8fe2 100644
--- a/debian/patches/019-remove-diaspora-vines.patch
+++ b/debian/patches/019-remove-diaspora-vines.patch
@@ -8,6 +8,6 @@ Index: diaspora/Gemfile
  # XMPP chat dependencies
 -gem "diaspora-vines",             "~> 0.2.0.develop"
 +#gem "diaspora-vines",             "~> 0.2.0.develop"
- gem "rails-assets-diaspora_jsxc", "~> 0.1.1", "< 0.1.4.develop", source: "https://rails-assets.org"
- gem "rails-assets-colorbox", "~> 1.6.3"
- gem "rails-assets-favico.js", "~> 0.3.9"
+ gem "rails-assets-diaspora_jsxc", "~> 0.1.4.alpha", "< 0.1.4.develop", source: "https://rails-assets.org"
+ 
+ # Tags
diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
index 99c2af1..d6f7053 100644
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ b/debian/patches/030-loosen-tiny-versions.patch
@@ -24,7 +24,7 @@ Index: diaspora/Gemfile
  
    gem "rails-assets-markdown-it",                         "4.4.0"
    gem "rails-assets-markdown-it-hashtag",                 "0.3.1"
-@@ -170,7 +170,7 @@ gem "gon",                     "6.0.1"
+@@ -168,7 +168,7 @@ gem "gon",                     "6.0.1"
  gem "haml",                    "4.0.6"
  gem "mobile-fu",               "1.3.1"
  gem "will_paginate",           "3.0.7"

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