[DRE-commits] [diaspora] 01/05: loosen compass-rails patch

[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 d525f4d10958a6f601526a4d0d31b9453362ecaf
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Aug 19 15:59:53 2015 +0530

    loosen compass-rails patch
---
 debian/changelog                              | 6 ++++++
 debian/control                                | 3 ++-
 debian/patches/030-loosen-tiny-versions.patch | 6 ++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0189c00..38042e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+diaspora (0.5.2.0+debian-3) UNRELEASED; urgency=medium
+
+  * Tighten ruby-compass-rails dependency 
+
+ -- Pirate Praveen <praveen at debian.org>  Wed, 19 Aug 2015 15:59:24 +0530
+
 diaspora (0.5.2.0+debian-2) experimental; urgency=medium
 
   * Move ruby-diaspora-vines to recommends (chat is still alpha)
diff --git a/debian/control b/debian/control
index 7b4a93d..8cae632 100644
--- a/debian/control
+++ b/debian/control
@@ -81,7 +81,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-zip-zip,
  ruby-entypo-rails,
 # ruby-bootstrap-sass,
- ruby-compass-rails,
+ ruby-compass-rails (>= 2.0.5),
+ ruby-compass-rails (<= 2.1),
  ruby-sass-rails (>= 5.0.1),
  ruby-sass-rails (<< 5.1),
  ruby-autoprefixer-rails (>= 5.2.1),
diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
index b924096..0a2546c 100644
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ b/debian/patches/030-loosen-tiny-versions.patch
@@ -20,12 +20,14 @@ Index: diaspora/Gemfile
  gem "sinatra", "1.4.6"
  
  # Scheduled processing
-@@ -54,15 +54,15 @@ gem "rack-cors", "0.4.0", require: "rack
+@@ -53,16 +53,16 @@ gem "rack-cors", "0.4.0", require: "rack
+ # CSS
  
  gem "bootstrap-sass", "2.3.2.2"
- gem "compass-rails",  "2.0.4"
+-gem "compass-rails",  "2.0.4"
 -gem "sass-rails",     "5.0.1"
 -gem "autoprefixer-rails", "5.2.1"
++gem "compass-rails",  "~> 2.0.4"
 +gem "sass-rails",     "~> 5.0.1"
 +gem "autoprefixer-rails", "~> 5.2.1"
  

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