[DRE-commits] [diaspora] 03/06: update Gemfile for sprockets 2.12

[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 277c18b6ee85a04aec78f2d89cfd14046c6af893
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Jan 7 12:06:56 2016 +0530

    update Gemfile for sprockets 2.12
---
 debian/install                         | 1 +
 debian/patches/031-embedded-gems.patch | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/install b/debian/install
index 1155812..3c03f9e 100644
--- a/debian/install
+++ b/debian/install
@@ -23,3 +23,4 @@ spec usr/share/diaspora
 tmp usr/share/diaspora
 vendor usr/share/diaspora
 debian/gems-compat/bootstrap-sass-2.3.2.2 usr/share/diaspora/vendor/gems
+debian/gems-compat/sprockets-2.12.4 usr/share/diaspora/vendor/gems
diff --git a/debian/patches/031-embedded-gems.patch b/debian/patches/031-embedded-gems.patch
index 7c720d2..08ffc14 100644
--- a/debian/patches/031-embedded-gems.patch
+++ b/debian/patches/031-embedded-gems.patch
@@ -2,12 +2,16 @@ Index: diaspora/Gemfile
 ===================================================================
 --- diaspora.orig/Gemfile
 +++ diaspora/Gemfile
-@@ -53,7 +53,7 @@ gem "rack-cors", "0.4.0", require: "rack
+@@ -53,8 +53,11 @@ gem "rack-cors", "0.4.0", require: "rack
  
  # CSS
  
 -gem "bootstrap-sass", "2.3.2.2"
 +gem "bootstrap-sass", "2.3.2.2", path: 'vendor/gems/bootstrap-sass-2.3.2.2'
  gem "compass-rails",  "2.0.5"
++# sprockets > 2.13 breaks compass-rails 
++# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=810162
++gem "sprockets", "< 2.13", path: 'vendor/gems/sprockets-2.12.4'
  gem "sass-rails",     "5.0.3"
  gem "autoprefixer-rails", "6.0.3"
+ 

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