[DRE-commits] [diaspora] 03/03: use a local copy of bootstrap-sass

[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 68a09e69e3924f925bea88e2b3ffdb28a8a0e94d
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat May 2 11:41:25 2015 +0530

    use a local copy of bootstrap-sass
---
 debian/control                                                        | 2 +-
 debian/patches/011-loosen-autoprefixer-rails-version.patch            | 2 +-
 .../{009-loosen-bootstrap-sass.patch => 031-embedded-gems.patch}      | 4 ++--
 debian/patches/series                                                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 9e517cd..63c83b7 100644
--- a/debian/control
+++ b/debian/control
@@ -75,7 +75,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-rails-timeago,
  ruby-zip-zip,
  ruby-entypo-rails,
- ruby-bootstrap-sass2,
+# ruby-bootstrap-sass,
  ruby-compass-rails,
  ruby-sass-rails,
  ruby-autoprefixer-rails,
diff --git a/debian/patches/011-loosen-autoprefixer-rails-version.patch b/debian/patches/011-loosen-autoprefixer-rails-version.patch
index 235bc72..73fd75b 100644
--- a/debian/patches/011-loosen-autoprefixer-rails-version.patch
+++ b/debian/patches/011-loosen-autoprefixer-rails-version.patch
@@ -3,7 +3,7 @@ Index: diaspora/Gemfile
 --- diaspora.orig/Gemfile
 +++ diaspora/Gemfile
 @@ -56,7 +56,7 @@ gem "rack-cors", "0.3.1", require: "rack
- gem "bootstrap-sass", "~> 2.3"
+ gem "bootstrap-sass", "2.3.2.2"
  gem "compass-rails",  "2.0.4"
  gem "sass-rails",     "5.0.1"
 -gem "autoprefixer-rails", "5.1.7.1"
diff --git a/debian/patches/009-loosen-bootstrap-sass.patch b/debian/patches/031-embedded-gems.patch
similarity index 76%
rename from debian/patches/009-loosen-bootstrap-sass.patch
rename to debian/patches/031-embedded-gems.patch
index 3e6e2ae..d74dc47 100644
--- a/debian/patches/009-loosen-bootstrap-sass.patch
+++ b/debian/patches/031-embedded-gems.patch
@@ -7,7 +7,7 @@ Index: diaspora/Gemfile
  # CSS
  
 -gem "bootstrap-sass", "2.3.2.2"
-+gem "bootstrap-sass", "~> 2.3"
++gem "bootstrap-sass", "2.3.2.2", path: 'vendor/gems' 
  gem "compass-rails",  "2.0.4"
  gem "sass-rails",     "5.0.1"
- gem "autoprefixer-rails", "5.1.7.1"
+ gem "autoprefixer-rails", "~> 5.1.7"
diff --git a/debian/patches/series b/debian/patches/series
index b2f1dfd..bfcef75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,13 +5,13 @@
 006-loosen-messagebus-ruby-api-version.patch
 007-loosen-roxml-version.patch
 008-loosen-twitter-version.patch
-009-loosen-bootstrap-sass.patch
 010-loosen-responders-version.patch
 011-loosen-autoprefixer-rails-version.patch
 012-loosen-foreman.patch
 018-loosen-rails-timeago.patch
 021-loosen-omniauth-facebook-version.patch
 030-loosen-tiny-versions.patch
+031-embedded-gems.patch
 040-disable-raise_in_transactional_callbacks.patch
 041-require-foreigner.patch
 042-fix-asset-check.patch

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