[DRE-commits] [diaspora] 05/07: disable diaspora vines

[Praveen Arimbrathodiyil]

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

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

commit d6300702e87b5b4efb2c633aec8620ac2cd36b30
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Jul 6 20:29:31 2016 +0530

    disable diaspora vines
---
 debian/changelog                                |  1 +
 debian/patches/052-disable-diaspora-vines.patch | 13 +++++++++++++
 debian/patches/series                           |  1 +
 3 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c1fd76a..d5b9b0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ diaspora (0.5.7.1+debian-2) UNRELEASED; urgency=medium
   * Relax unicorn dependency in Gemfile
   * Relax jquery-rails dependency in Gemfile
   * Relax rails-assets-jquery in Gemfile
+  * Disable diaspora-vines in Gemfile
 
  -- Pirate Praveen <praveen at debian.org>  Wed, 06 Jul 2016 20:01:44 +0530
 
diff --git a/debian/patches/052-disable-diaspora-vines.patch b/debian/patches/052-disable-diaspora-vines.patch
new file mode 100644
index 0000000..db1b368
--- /dev/null
+++ b/debian/patches/052-disable-diaspora-vines.patch
@@ -0,0 +1,13 @@
+Index: diaspora/Gemfile
+===================================================================
+--- diaspora.orig/Gemfile
++++ diaspora/Gemfile
+@@ -147,7 +147,7 @@ gem "omniauth-wordpress", "0.2.2"
+ gem "active_model_serializers", "0.9.4"
+ 
+ # XMPP chat dependencies
+-gem "diaspora-vines",             "~> 0.2.0.develop"
++#gem "diaspora-vines",             "~> 0.2.0.develop"
+ gem "rails-assets-diaspora_jsxc", "~> 0.1.4", source: "https://rails-assets.org"
+ 
+ # Tags
diff --git a/debian/patches/series b/debian/patches/series
index 11a5ea1..43021c7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 045-replace-sidetiq.patch
 050-relax-stable-libs.patch
 051-relax-patch-release-versions.patch
+052-disable-diaspora-vines.patch

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