[DRE-commits] [diaspora] 03/03: refresh patches

[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 f3249c05ff74661dc5eddad32cfde78089fd586e
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Jan 1 23:14:09 2016 +0530

    refresh patches
---
 .../patches/002-remove-development-test-from-gemfile.patch  |  8 ++++----
 debian/patches/007-loosen-roxml-version.patch               |  4 ++--
 debian/patches/020-loosen-redcarpet.patch                   | 13 -------------
 debian/patches/030-loosen-tiny-versions.patch               |  2 +-
 debian/patches/032-loosen-rails.patch                       | 12 ------------
 debian/patches/033-relax-nokogiri.patch                     | 13 -------------
 debian/patches/series                                       |  3 ---
 7 files changed, 7 insertions(+), 48 deletions(-)

diff --git a/debian/patches/002-remove-development-test-from-gemfile.patch b/debian/patches/002-remove-development-test-from-gemfile.patch
index c8edb7f..8c09fdf 100644
--- a/debian/patches/002-remove-development-test-from-gemfile.patch
+++ b/debian/patches/002-remove-development-test-from-gemfile.patch
@@ -19,7 +19,7 @@ Index: diaspora/Gemfile
 -
 -  # Linters
 -  gem "jshintrb", "0.3.0"
--  gem "rubocop",  "0.32.1"
+-  gem "rubocop",  "0.34.2"
 -
 -  # Preloading environment
 -
@@ -47,15 +47,15 @@ Index: diaspora/Gemfile
 -  # Cucumber (integration tests)
 -
 -  gem "capybara",           "2.5.0"
--  gem "database_cleaner" ,  "1.5.0"
+-  gem "database_cleaner" ,  "1.5.1"
 -  gem "selenium-webdriver", "2.47.1"
 -
 -  # General helpers
 -
 -  gem "factory_girl_rails", "4.5.0"
 -  gem "timecop",            "0.8.0"
--  gem "webmock",            "1.21.0", require: false
--  gem "shoulda-matchers",   "2.8.0", require: false
+-  gem "webmock",            "1.22.1", require: false
+-  gem "shoulda-matchers",   "3.0.0"
 -end
 -
 -group :development, :test do
diff --git a/debian/patches/007-loosen-roxml-version.patch b/debian/patches/007-loosen-roxml-version.patch
index 1585ec3..a308df5 100644
--- a/debian/patches/007-loosen-roxml-version.patch
+++ b/debian/patches/007-loosen-roxml-version.patch
@@ -3,8 +3,8 @@ Index: diaspora/Gemfile
 --- diaspora.orig/Gemfile
 +++ diaspora/Gemfile
 @@ -129,7 +129,7 @@ gem "messagebus_ruby_api", "1.0.3"
- gem "nokogiri",          "1.6.6.2"
- gem "redcarpet",         "3.3.2"
+ gem "nokogiri",          "1.6.7.1"
+ gem "redcarpet",         "3.3.3"
  gem "twitter-text",      "1.13.0"
 -gem "roxml",             "3.1.6"
 +gem "roxml",             "~> 3.1"
diff --git a/debian/patches/020-loosen-redcarpet.patch b/debian/patches/020-loosen-redcarpet.patch
deleted file mode 100644
index 0662d68..0000000
--- a/debian/patches/020-loosen-redcarpet.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: diaspora/Gemfile
-===================================================================
---- diaspora.orig/Gemfile
-+++ diaspora/Gemfile
-@@ -127,7 +127,7 @@ gem "messagebus_ruby_api", "1.0.3"
- # Parsing
- 
- gem "nokogiri",          "1.6.6.2"
--gem "redcarpet",         "3.3.2"
-+gem "redcarpet",         "~> 3.2"
- gem "twitter-text",      "1.13.0"
- gem "roxml",             "~> 3.1"
- gem "ruby-oembed",       "0.8.14"
diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
index ae27587..40039e7 100644
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ b/debian/patches/030-loosen-tiny-versions.patch
@@ -18,7 +18,7 @@ Index: diaspora/Gemfile
 -  gem "rails-assets-jquery",                              "1.11.2" # 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-markdown-it",                         "5.0.0"
+   gem "rails-assets-markdown-it",                         "5.0.2"
    gem "rails-assets-markdown-it-hashtag",                 "0.4.0"
 @@ -169,7 +169,7 @@ gem "gon",                     "6.0.1"
  gem "haml",                    "4.0.7"
diff --git a/debian/patches/032-loosen-rails.patch b/debian/patches/032-loosen-rails.patch
deleted file mode 100644
index adf817f..0000000
--- a/debian/patches/032-loosen-rails.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: diaspora/Gemfile
-===================================================================
---- diaspora.orig/Gemfile
-+++ diaspora/Gemfile
-@@ -1,6 +1,6 @@
- source "https://rubygems.org"
- 
--gem "rails", "4.2.4"
-+gem "rails", "~> 4.2.4"
- 
- # Legacy Rails features, remove me!
- # responders (class level)
diff --git a/debian/patches/033-relax-nokogiri.patch b/debian/patches/033-relax-nokogiri.patch
deleted file mode 100644
index ab6bc99..0000000
--- a/debian/patches/033-relax-nokogiri.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: diaspora/Gemfile
-===================================================================
---- diaspora.orig/Gemfile
-+++ diaspora/Gemfile
-@@ -126,7 +126,7 @@ gem "messagebus_ruby_api", "1.0.3"
- 
- # Parsing
- 
--gem "nokogiri",          "1.6.6.2"
-+gem "nokogiri",          "~> 1.6"
- gem "redcarpet",         "~> 3.2"
- gem "twitter-text",      "1.13.0"
- gem "roxml",             "~> 3.1"
diff --git a/debian/patches/series b/debian/patches/series
index 1cef58d..64a47d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,9 +2,6 @@
 007-loosen-roxml-version.patch
 008-add-colorbox.patch
 019-remove-diaspora-vines.patch
-020-loosen-redcarpet.patch
 030-loosen-tiny-versions.patch
 031-embedded-gems.patch
-032-loosen-rails.patch
-033-relax-nokogiri.patch
 043-dont-do-git-checks.patch

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