[DRE-commits] [diaspora] 02/10: add favico.js dep

[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 6c37e5675c41f6364757df350acedf17a690a1c1
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Sep 5 19:31:22 2015 +0530

    add favico.js dep
---
 debian/control                                | 1 +
 debian/patches/008-loosen-diaspora-jsxc.patch | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 23a2942..6c9f73a 100644
--- a/debian/control
+++ b/debian/control
@@ -68,6 +68,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-active-model-serializers,
  ruby-rails-assets-diaspora-jsxc,
  ruby-rails-assets-colorbox,
+ ruby-rails-assets-favico.js,
  ruby-acts-as-taggable-on,
  ruby-addressable (>= 2.3.8),
  ruby-faraday (>= 0.9.1),
diff --git a/debian/patches/008-loosen-diaspora-jsxc.patch b/debian/patches/008-loosen-diaspora-jsxc.patch
index 7f73bed..62341a6 100644
--- a/debian/patches/008-loosen-diaspora-jsxc.patch
+++ b/debian/patches/008-loosen-diaspora-jsxc.patch
@@ -2,13 +2,14 @@ Index: diaspora/Gemfile
 ===================================================================
 --- diaspora.orig/Gemfile
 +++ diaspora/Gemfile
-@@ -148,7 +148,8 @@ gem "active_model_serializers", "0.9.3"
+@@ -148,7 +148,9 @@ 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"
++gem "rails-assets-favico.js", "~> 0.3.9"
  
  # Tags
  

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