[DRE-commits] [diaspora] 03/03: haml in sync

[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 169b9bf25e3a58efddaec2d5a652e04ad976312a
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Aug 29 10:45:47 2015 +0530

    haml in sync
---
 debian/changelog                              | 2 +-
 debian/control                                | 2 +-
 debian/patches/030-loosen-tiny-versions.patch | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 768f723..2400d94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ diaspora (0.5.2.0+debian-7) UNRELEASED; urgency=medium
   * Stop diaspora before upgrade
   * Set minimum version for ruby-rails-assets-markdown-it, ruby-fog,
     ruby-rack-rewrite, ruby-uuid, ruby-mini-magick, ruby-rack-protection,
-    ruby-rails-admin, ruby-zip
+    ruby-rails-admin, ruby-zip, ruby-haml
   * Add ruby-responders to dependencies
 
  -- Pirate Praveen <praveen at debian.org>  Fri, 28 Aug 2015 14:52:07 +0530
diff --git a/debian/control b/debian/control
index b9b9062..74ec529 100644
--- a/debian/control
+++ b/debian/control
@@ -74,7 +74,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-typhoeus,
  ruby-client-side-validations,
  ruby-gon,
- ruby-haml,
+ ruby-haml (>= 4.0.6),
  ruby-mobile-fu,
  ruby-will-paginate,
  ruby-rails-timeago,
diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
index 5ad8b99..fee2871 100644
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ b/debian/patches/030-loosen-tiny-versions.patch
@@ -71,7 +71,7 @@ Index: diaspora/Gemfile
    gem "rails-assets-jquery-textchange",             "0.2.3"
    gem "rails-assets-perfect-scrollbar",             "0.6.3"
    gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11"
-@@ -155,19 +155,19 @@ gem "acts-as-taggable-on", "3.5.0"
+@@ -155,11 +155,11 @@ gem "acts-as-taggable-on", "3.5.0"
  
  # URIs and HTTP
  
@@ -86,9 +86,8 @@ Index: diaspora/Gemfile
  
  # Views
  
- gem "gon",                     "5.2.3"
--gem "haml",                    "4.0.6"
-+gem "haml",                    "~> 4.0.5"
+@@ -167,7 +167,7 @@ gem "gon",                     "5.2.3"
+ gem "haml",                    "4.0.6"
  gem "mobile-fu",               "1.3.1"
  gem "will_paginate",           "3.0.7"
 -gem "rails-timeago",           "2.11.0"

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