[DRE-commits] [diaspora] 01/01: loosen 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.3.0
in repository diaspora.

commit b3336e86d0758b61203d993638e79a20b72a1da7
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Sep 2 20:45:54 2015 +0530

    loosen diaspora-jsxc
---
 debian/patches/008-loosen-diaspora-jsxc.patch  | 13 +++++++++++++
 debian/patches/019-remove-diaspora-vines.patch |  2 +-
 debian/patches/series                          |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/debian/patches/008-loosen-diaspora-jsxc.patch b/debian/patches/008-loosen-diaspora-jsxc.patch
new file mode 100644
index 0000000..a02934b
--- /dev/null
+++ b/debian/patches/008-loosen-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.1", "< 0.1.4.develop", source: "https://rails-assets.org"
+ 
+ # Tags
+ 
diff --git a/debian/patches/019-remove-diaspora-vines.patch b/debian/patches/019-remove-diaspora-vines.patch
index 71a8fe2..cb13d11 100644
--- a/debian/patches/019-remove-diaspora-vines.patch
+++ b/debian/patches/019-remove-diaspora-vines.patch
@@ -8,6 +8,6 @@ Index: diaspora/Gemfile
  # XMPP chat dependencies
 -gem "diaspora-vines",             "~> 0.2.0.develop"
 +#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.1", "< 0.1.4.develop", source: "https://rails-assets.org"
  
  # Tags
diff --git a/debian/patches/series b/debian/patches/series
index 918aaba..b734928 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 002-remove-development-test-from-gemfile.patch
 007-loosen-roxml-version.patch
+008-loosen-diaspora-jsxc.patch
 019-remove-diaspora-vines.patch
 020-loosen-minor-versions.patch
 030-loosen-tiny-versions.patch

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