[DRE-commits] [diaspora] 04/09: diaspora_jsxc is 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 d1858941b7113c3a934ae99a202e234d2a956083
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Sep 17 04:46:11 2015 +0530

    diaspora_jsxc is in sync
---
 debian/patches/008-loosen-diaspora-jsxc.patch | 16 ----------------
 debian/patches/series                         |  1 -
 2 files changed, 17 deletions(-)

diff --git a/debian/patches/008-loosen-diaspora-jsxc.patch b/debian/patches/008-loosen-diaspora-jsxc.patch
deleted file mode 100644
index d4faa01..0000000
--- a/debian/patches/008-loosen-diaspora-jsxc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: diaspora/Gemfile
-===================================================================
---- diaspora.orig/Gemfile
-+++ diaspora/Gemfile
-@@ -148,7 +148,10 @@ 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"
-+gem "rails-assets-colorbox", "~> 1.6.3"
-+gem "rails-assets-favico.js", "~> 0.3.9"
-+gem "rails-assets-jquery-fullscreen-plugin", "~> 0.5.0"
- 
- # Tags
- 
diff --git a/debian/patches/series b/debian/patches/series
index b734928..918aaba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 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