[DRE-commits] [diaspora] 04/07: relax rails-assets-jquery
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Wed Jul 6 15:41:30 UTC 2016
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master-0.5.7
in repository diaspora.
commit 407c696a7a6e0a77fbc136da3e9cd0d00adc5548
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Wed Jul 6 20:24:17 2016 +0530
relax rails-assets-jquery
---
debian/changelog | 1 +
debian/patches/050-relax-stable-libs.patch | 8 ++++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e37ef6d..c1fd76a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ diaspora (0.5.7.1+debian-2) UNRELEASED; urgency=medium
* Fix syntax in Gemfile
* Relax unicorn dependency in Gemfile
* Relax jquery-rails dependency in Gemfile
+ * Relax rails-assets-jquery in Gemfile
-- Pirate Praveen <praveen at debian.org> Wed, 06 Jul 2016 20:01:44 +0530
diff --git a/debian/patches/050-relax-stable-libs.patch b/debian/patches/050-relax-stable-libs.patch
index 945b52a..9c4fde8 100644
--- a/debian/patches/050-relax-stable-libs.patch
+++ b/debian/patches/050-relax-stable-libs.patch
@@ -40,7 +40,7 @@ Index: diaspora/Gemfile
gem "remotipart", "1.2.1"
# GUID generation
-@@ -85,10 +85,10 @@ gem "entypo-rails", "2.2.3"
+@@ -85,13 +85,13 @@ gem "entypo-rails", "2.2.3"
gem "backbone-on-rails", "1.2.0.0"
gem "handlebars_assets", "0.23.0"
@@ -52,7 +52,11 @@ Index: diaspora/Gemfile
+gem "js-routes", "~> 1.2"
source "https://rails-assets.org" do
- gem "rails-assets-jquery", "1.11.1" # Should be kept in sync with jquery-rails
+- gem "rails-assets-jquery", "1.11.1" # Should be kept in sync with jquery-rails
++ gem "rails-assets-jquery", "~> 1.11" # Should be kept in sync with jquery-rails
+
+ gem "rails-assets-markdown-it", "6.0.0"
+ gem "rails-assets-markdown-it-hashtag", "0.4.0"
@@ -105,7 +105,7 @@ source "https://rails-assets.org" do
# jQuery plugins
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git
More information about the Pkg-ruby-extras-commits
mailing list