[DRE-commits] [diaspora] 01/01: workaround sprockets3 favico.js issue

[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 a4116580a394e50b51a6e218f785622c97c894ad
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Jan 6 00:19:01 2016 +0530

    workaround sprockets3 favico.js issue
---
 debian/patches/044-work-around-sprockets3.patch | 14 ++++++++++++++
 debian/patches/series                           |  1 +
 2 files changed, 15 insertions(+)

diff --git a/debian/patches/044-work-around-sprockets3.patch b/debian/patches/044-work-around-sprockets3.patch
new file mode 100644
index 0000000..f7098ac
--- /dev/null
+++ b/debian/patches/044-work-around-sprockets3.patch
@@ -0,0 +1,14 @@
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809707
+
+Index: diaspora/app/assets/javascripts/jsxc.js
+===================================================================
+--- diaspora.orig/app/assets/javascripts/jsxc.js
++++ diaspora/app/assets/javascripts/jsxc.js
+@@ -1,6 +1,6 @@
+ //= require jquery.slimscroll
+ //= require colorbox
+-//= require favico.js
++//= require favico.js/favico.js
+ //= require jquery-fullscreen-plugin
+ //= require diaspora_jsxc
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 64a47d6..a939ddd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 030-loosen-tiny-versions.patch
 031-embedded-gems.patch
 043-dont-do-git-checks.patch
+044-work-around-sprockets3.patch

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