[DRE-commits] [diaspora] 01/02: depend on ruby-bootstrap-sass2

[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 9903d15e9bf49111549eee036b485bb301a3415e
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Apr 12 23:10:35 2015 +0530

    depend on ruby-bootstrap-sass2
---
 debian/control                                 |  2 +-
 debian/patches/009-loosen-bootstrap-sass.patch | 19 +------------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/debian/control b/debian/control
index 8e83289..9caecba 100644
--- a/debian/control
+++ b/debian/control
@@ -74,7 +74,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-rails-timeago,
  ruby-zip-zip,
  ruby-entypo-rails,
- ruby-bootstrap-sass,
+ ruby-bootstrap-sass2,
  ruby-compass-rails,
  ruby-sass-rails,
  ruby-autoprefixer-rails,
diff --git a/debian/patches/009-loosen-bootstrap-sass.patch b/debian/patches/009-loosen-bootstrap-sass.patch
index dbdc030..3e6e2ae 100644
--- a/debian/patches/009-loosen-bootstrap-sass.patch
+++ b/debian/patches/009-loosen-bootstrap-sass.patch
@@ -7,24 +7,7 @@ Index: diaspora/Gemfile
  # CSS
  
 -gem "bootstrap-sass", "2.3.2.2"
-+gem "bootstrap-sass", ">= 2.3"
++gem "bootstrap-sass", "~> 2.3"
  gem "compass-rails",  "2.0.4"
  gem "sass-rails",     "5.0.1"
  gem "autoprefixer-rails", "5.1.7.1"
-Index: diaspora/app/assets/javascripts/main.js
-===================================================================
---- diaspora.orig/app/assets/javascripts/main.js
-+++ diaspora/app/assets/javascripts/main.js
-@@ -40,8 +40,8 @@
- //= require view
- //= require aspects-dropdown
- //= require mentions
--//= require bootstrap-tooltip
--//= require bootstrap-popover
--//= require bootstrap-dropdown
--//= require bootstrap-modal
-+//= require bootstrap/tooltip
-+//= require bootstrap/popover
-+//= require bootstrap/dropdown
-+//= require bootstrap/modal
- //= require osmlocator

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