[DRE-commits] [diaspora] 06/09: include colorbox in Gemfile

[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 088e29b69684d69ad3a005b16dd91eb649761d8a
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Sep 17 05:01:18 2015 +0530

    include colorbox in Gemfile
---
 .../{019-remove-diaspora-vines.patch => 008-add-colorbox.patch}  | 9 ++++-----
 debian/patches/019-remove-diaspora-vines.patch                   | 2 +-
 debian/patches/030-loosen-tiny-versions.patch                    | 2 +-
 debian/patches/series                                            | 1 +
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/019-remove-diaspora-vines.patch b/debian/patches/008-add-colorbox.patch
similarity index 58%
copy from debian/patches/019-remove-diaspora-vines.patch
copy to debian/patches/008-add-colorbox.patch
index 71a8fe2..fe8537f 100644
--- a/debian/patches/019-remove-diaspora-vines.patch
+++ b/debian/patches/008-add-colorbox.patch
@@ -2,12 +2,11 @@ Index: diaspora/Gemfile
 ===================================================================
 --- diaspora.orig/Gemfile
 +++ diaspora/Gemfile
-@@ -147,7 +147,7 @@ gem "omniauth-wordpress", "0.2.2"
- gem "active_model_serializers", "0.9.3"
- 
+@@ -149,6 +149,7 @@ gem "active_model_serializers", "0.9.3"
  # XMPP chat dependencies
--gem "diaspora-vines",             "~> 0.2.0.develop"
-+#gem "diaspora-vines",             "~> 0.2.0.develop"
+ 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-colorbox", "~> 1.6.3"
  
  # Tags
+ 
diff --git a/debian/patches/019-remove-diaspora-vines.patch b/debian/patches/019-remove-diaspora-vines.patch
index 71a8fe2..e9b2645 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.4.alpha", "< 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"
diff --git a/debian/patches/series b/debian/patches/series
index 918aaba..59fdd19 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 002-remove-development-test-from-gemfile.patch
 007-loosen-roxml-version.patch
+008-add-colorbox.patch
 019-remove-diaspora-vines.patch
 020-loosen-minor-versions.patch
 030-loosen-tiny-versions.patch

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