[DRE-commits] [diaspora] 01/10: refresh patches to include colorbox

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master-0.5.3.0
in repository diaspora.

commit 03550322084776a6b624313c1f58859e47c6ba2a
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Sep 4 11:16:02 2015 +0530

    refresh patches to include colorbox
---
 debian/patches/008-loosen-diaspora-jsxc.patch  | 3 ++-
 debian/patches/019-remove-diaspora-vines.patch | 2 +-
 debian/patches/030-loosen-tiny-versions.patch  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/patches/008-loosen-diaspora-jsxc.patch b/debian/patches/008-loosen-diaspora-jsxc.patch
index a02934b..7f73bed 100644
--- a/debian/patches/008-loosen-diaspora-jsxc.patch
+++ b/debian/patches/008-loosen-diaspora-jsxc.patch
@@ -2,12 +2,13 @@ Index: diaspora/Gemfile
 ===================================================================
 --- diaspora.orig/Gemfile
 +++ diaspora/Gemfile
-@@ -148,7 +148,7 @@ gem "active_model_serializers", "0.9.3"
+@@ -148,7 +148,8 @@ 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-diaspora_jsxc", "~> 0.1.1", "< 0.1.4.develop", source: "https://rails-assets.org"
++gem "rails-assets-colorbox", "~> 1.6.3"
  
  # Tags
  
diff --git a/debian/patches/019-remove-diaspora-vines.patch b/debian/patches/019-remove-diaspora-vines.patch
index cb13d11..3706214 100644
--- a/debian/patches/019-remove-diaspora-vines.patch
+++ b/debian/patches/019-remove-diaspora-vines.patch
@@ -9,5 +9,5 @@ Index: diaspora/Gemfile
 -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"
  
- # Tags
diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
index d6f7053..61dce72 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"
-@@ -168,7 +168,7 @@ gem "gon",                     "6.0.1"
+@@ -169,7 +169,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