[DRE-commits] [diaspora] 05/06: loosen ruby-sass-rails dependency

[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 17cf47adac48542ae40d78ec9031d33289c01e8e
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Aug 19 10:58:32 2015 +0530

    loosen ruby-sass-rails dependency
---
 debian/changelog                              | 5 ++---
 debian/control                                | 3 ++-
 debian/patches/030-loosen-tiny-versions.patch | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 94913ca..8255491 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,8 @@
 diaspora (0.5.2.0+debian-2) UNRELEASED; urgency=medium
 
   * Move ruby-diaspora-vines to recommends (chat is still alpha)
-  * Tighten dependency on ruby-rails
-  * Loosen dependency of ruby-devise-lastseenable
-  * Tighten dependency on ruby-sidekiq
+  * Tighten dependency on ruby-rails, ruby-sidekiq
+  * Loosen dependency of ruby-devise-lastseenable, ruby-sass-rails
 
  -- Pirate Praveen <praveen at debian.org>  Tue, 18 Aug 2015 22:20:50 +0530
 
diff --git a/debian/control b/debian/control
index 8afe73c..74b7929 100644
--- a/debian/control
+++ b/debian/control
@@ -82,7 +82,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-entypo-rails,
 # ruby-bootstrap-sass,
  ruby-compass-rails,
- ruby-sass-rails,
+ ruby-sass-rails (>= 5.0.1),
+ ruby-sass-rails (<< 5.1),
  ruby-autoprefixer-rails,
  ruby-uglifier,
  ruby-backbone-on-rails,
diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
index 5a72480..b924096 100644
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ b/debian/patches/030-loosen-tiny-versions.patch
@@ -20,11 +20,13 @@ Index: diaspora/Gemfile
  gem "sinatra", "1.4.6"
  
  # Scheduled processing
-@@ -55,14 +55,14 @@ gem "rack-cors", "0.4.0", require: "rack
+@@ -54,15 +54,15 @@ gem "rack-cors", "0.4.0", require: "rack
+ 
  gem "bootstrap-sass", "2.3.2.2"
  gem "compass-rails",  "2.0.4"
- gem "sass-rails",     "5.0.1"
+-gem "sass-rails",     "5.0.1"
 -gem "autoprefixer-rails", "5.2.1"
++gem "sass-rails",     "~> 5.0.1"
 +gem "autoprefixer-rails", "~> 5.2.1"
  
  # Database

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