[DRE-commits] [diaspora] 04/04: handlebars-assets 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 879d509d60451378efe2ca02853d6fe54d6dbcc8
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Aug 29 18:34:18 2015 +0530

    handlebars-assets in sync
---
 debian/changelog                              | 3 ++-
 debian/control                                | 2 +-
 debian/patches/030-loosen-tiny-versions.patch | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7626c74..271651c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,8 @@ diaspora (0.5.2.0+debian-7) UNRELEASED; urgency=medium
   * 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-haml, ruby-typhoeus, ruby-faraday,
-    ruby-addressable, ruby-rails-assets-jquery-placeholder, ruby-js-routes
+    ruby-addressable, ruby-rails-assets-jquery-placeholder, ruby-js-routes,
+    ruby-handlebars-assets
   * 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 46f597e..ea4b2ed 100644
--- a/debian/control
+++ b/debian/control
@@ -90,7 +90,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-autoprefixer-rails (<< 5.3),
  ruby-uglifier,
  ruby-backbone-on-rails,
- ruby-handlebars-assets (>=0.18~),
+ ruby-handlebars-assets (>= 2:0.20.2~),
  ruby-jquery-rails (>= 4.0.4-2~),
  ruby-js-image-paths,
  ruby-js-routes (>= 1.0.1),
diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
index 4f992c8..aed57be 100644
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ b/debian/patches/030-loosen-tiny-versions.patch
@@ -46,9 +46,8 @@ Index: diaspora/Gemfile
  # JavaScript
  
 -gem "backbone-on-rails", "1.1.2.1"
--gem "handlebars_assets", "0.20.2"
 +gem "backbone-on-rails", "~> 1.1.2"
-+gem "handlebars_assets", "~> 0.20.1"
+ gem "handlebars_assets", "0.20.2"
  gem "jquery-rails",      "4.0.4"
 -gem "jquery-ui-rails",   "5.0.5"
 +gem "jquery-ui-rails",   "~> 5.0.3"

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