[DRE-commits] [diaspora] 03/04: js-routes 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 5762f4105090bc307c4a979646b95814627072d5
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Aug 29 18:29:26 2015 +0530

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

diff --git a/debian/changelog b/debian/changelog
index 65df60b..7626c74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ 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-addressable, ruby-rails-assets-jquery-placeholder, ruby-js-routes
   * 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 59c7647..46f597e 100644
--- a/debian/control
+++ b/debian/control
@@ -93,7 +93,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-handlebars-assets (>=0.18~),
  ruby-jquery-rails (>= 4.0.4-2~),
  ruby-js-image-paths,
- ruby-js-routes,
+ ruby-js-routes (>= 1.0.1),
  ruby-rails-assets-jquery,
  ruby-rails-assets-markdown-it (>= 4.4.0),
  ruby-rails-assets-markdown-it-hashtag,
diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
index 6f34acb..4f992c8 100644
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ b/debian/patches/030-loosen-tiny-versions.patch
@@ -53,8 +53,7 @@ Index: diaspora/Gemfile
 -gem "jquery-ui-rails",   "5.0.5"
 +gem "jquery-ui-rails",   "~> 5.0.3"
  gem "js_image_paths",    "0.0.2"
--gem "js-routes",         "1.0.1"
-+gem "js-routes",         "~> 1.0.0"
+ gem "js-routes",         "1.0.1"
  
  source "https://rails-assets.org" do
 -  gem "rails-assets-jquery",                              "1.11.2" # Should be kept in sync with jquery-rails

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