[DRE-commits] [diaspora] 02/03: relax diaspora_jsxc

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master-0.5.5
in repository diaspora.

commit aa8856b89d05820701663a187815502bbec580ef
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Jul 6 00:15:21 2016 +0530

    relax diaspora_jsxc
---
 debian/changelog                             |  3 ++-
 debian/patches/052-relax-diaspora-jsxc.patch | 13 +++++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e5b52a7..97e8513 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 diaspora (0.5.5.1+debian-9) UNRELEASED; urgency=medium
 
-  * Relax version of addressable 
+  * Relax version of addressable in Gemfile
+  * Relax version of rails-assets-diaspora_jsxc in Gemfile
 
  -- Pirate Praveen <praveen at debian.org>  Tue, 05 Jul 2016 23:57:24 +0530
 
diff --git a/debian/patches/052-relax-diaspora-jsxc.patch b/debian/patches/052-relax-diaspora-jsxc.patch
new file mode 100644
index 0000000..0ee1735
--- /dev/null
+++ b/debian/patches/052-relax-diaspora-jsxc.patch
@@ -0,0 +1,13 @@
+Index: diaspora/Gemfile
+===================================================================
+--- diaspora.orig/Gemfile
++++ diaspora/Gemfile
+@@ -148,7 +148,7 @@ gem "active_model_serializers", "0.9.3"
+ 
+ # XMPP chat dependencies
+ #gem "diaspora-vines",             "~> 0.2.0.develop"
+-gem "rails-assets-diaspora_jsxc", "~> 0.1.4.alpha", "< 0.1.4.develop", source: "https://rails-assets.org"
++gem "rails-assets-diaspora_jsxc", "~> 0.1.4", source: "https://rails-assets.org"
+ gem "rails-assets-colorbox", "~> 1.6.3"
+ 
+ # Tags
diff --git a/debian/patches/series b/debian/patches/series
index 3edc2a0..1ec1b40 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 045-replace-sidetiq.patch
 050-relax-stable-libs.patch
 051-relax-patch-release-versions.patch
+052-relax-diaspora-jsxc.patch

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