[DRE-commits] [diaspora] 66/257: refresh loosen-roxml-version.patch

[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 a7304bd9d9432a77b2057e9abaf73a0287961d3f
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Nov 18 23:43:19 2014 +0530

    refresh loosen-roxml-version.patch
---
 debian/patches/007-loosen-roxml-version.patch | 13 +++++++++++++
 debian/patches/loosen-roxml-version.patch     | 11 -----------
 debian/patches/series                         |  2 +-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/debian/patches/007-loosen-roxml-version.patch b/debian/patches/007-loosen-roxml-version.patch
new file mode 100644
index 0000000..a384082
--- /dev/null
+++ b/debian/patches/007-loosen-roxml-version.patch
@@ -0,0 +1,13 @@
+Index: diaspora/Gemfile
+===================================================================
+--- diaspora.orig/Gemfile
++++ diaspora/Gemfile
+@@ -112,7 +112,7 @@ gem 'messagebus_ruby_api', '>= 1.0.3'
+ gem 'nokogiri',         '1.6.4.1'
+ gem 'redcarpet',        '3.2.0'
+ gem 'twitter-text',     '1.10.0'
+-gem 'roxml',            '3.1.6'
++gem 'roxml',            '>= 3.1.6'
+ gem 'ruby-oembed',      '0.8.11'
+ gem 'opengraph_parser', '0.2.3'
+ 
diff --git a/debian/patches/loosen-roxml-version.patch b/debian/patches/loosen-roxml-version.patch
deleted file mode 100644
index 714ec4c..0000000
--- a/debian/patches/loosen-roxml-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -65,7 +65,7 @@
- gem 'nokogiri',         '1.6.1'
- gem 'rails_autolink',   '1.1.5'
- gem 'redcarpet',        '>= 3.0.0'
--gem 'roxml',            '3.1.6'
-+gem 'roxml',            '>= 3.1.6'
- gem 'ruby-oembed',      '0.8.9'
- gem 'opengraph_parser', '0.2.3'
- 
diff --git a/debian/patches/series b/debian/patches/series
index 314d81e..72f6c5d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,7 @@ remove-gemfile-lock.patch
 004-loosen-sidekiq-version.patch
 005-loosen-sinatra-version.patch
 006-loosen-messagebus-ruby-api-version.patch
-loosen-roxml-version.patch
+007-loosen-roxml-version.patch
 loosen-twitter-version.patch
 loosen-faraday-version.patch
 loosen-fraraday-middleware-version.patch

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