[DRE-commits] [diaspora] 01/01: move ruby-diaspora-vines to recommends

[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 c88261fc71d0e02dd5bb5bde037fdc0c955a56aa
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Aug 18 22:23:43 2015 +0530

    move ruby-diaspora-vines to recommends
---
 debian/changelog                               |  6 ++++++
 debian/control                                 |  2 +-
 debian/patches/019-remove-diaspora-vines.patch | 13 +++++++++++++
 debian/patches/series                          |  1 +
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2cb674f..53341e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+diaspora (0.5.2.0+debian-2) UNRELEASED; urgency=medium
+
+  * Move ruby-diaspora-vines to recommends (chat is still alpha)
+
+ -- Pirate Praveen <praveen at debian.org>  Tue, 18 Aug 2015 22:20:50 +0530
+
 diaspora (0.5.2.0+debian-1) experimental; urgency=low
 
   * Initial release (Closes: #597093)
diff --git a/debian/control b/debian/control
index 02b1a1d..372f75a 100644
--- a/debian/control
+++ b/debian/control
@@ -61,7 +61,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-twitter,
  ruby-omniauth-wordpress,
  ruby-active-model-serializers,
- ruby-diaspora-vines,
  ruby-rails-assets-diaspora-jsxc,
  ruby-acts-as-taggable-on,
  ruby-addressable,
@@ -125,6 +124,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  fonts-roboto
 Conflicts: diaspora-installer, ruby-jbuilder
 Replaces: diaspora-installer
+Recommends: ruby-diaspora-vines
 Description: distributed social networking service
  Diaspora (currently styled diaspora* and formerly styled DIASPORA*) is a free
  personal web server that implements a distributed social networking service.
diff --git a/debian/patches/019-remove-diaspora-vines.patch b/debian/patches/019-remove-diaspora-vines.patch
new file mode 100644
index 0000000..b6d2010
--- /dev/null
+++ b/debian/patches/019-remove-diaspora-vines.patch
@@ -0,0 +1,13 @@
+Index: diaspora/Gemfile
+===================================================================
+--- diaspora.orig/Gemfile
++++ diaspora/Gemfile
+@@ -146,7 +146,7 @@ gem "omniauth-wordpress", "0.2.2"
+ gem "active_model_serializers", "0.9.3"
+ 
+ # XMPP chat dependencies
+-gem "diaspora-vines",             "~> 0.1.27"
++#gem "diaspora-vines",             "~> 0.1.27"
+ gem "rails-assets-diaspora_jsxc", "~> 0.1.1", source: "https://rails-assets.org"
+ 
+ # Tags
diff --git a/debian/patches/series b/debian/patches/series
index 3cc35fe..d949ef9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,7 @@
 007-loosen-roxml-version.patch
 010-loosen-responders-version.patch
 018-loosen-rails-timeago.patch
+019-remove-diaspora-vines.patch
 020-loosen-minor-versions.patch
 030-loosen-tiny-versions.patch
 031-embedded-gems.patch

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