[DRE-commits] [diaspora] 04/07: refresh patches
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Thu Oct 29 14:46:50 UTC 2015
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository diaspora.
commit f42ca33f62f9b548c8c498d1316bb67711df56a7
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Thu Oct 29 16:10:24 2015 +0530
refresh patches
---
.../002-remove-development-test-from-gemfile.patch | 14 +++++++-------
debian/patches/007-loosen-roxml-version.patch | 2 +-
...r-versions.patch => 020-loosen-redcarpet.patch} | 2 +-
debian/patches/030-loosen-tiny-versions.patch | 22 +++++++++-------------
debian/patches/031-embedded-gems.patch | 6 +++---
debian/patches/series | 2 +-
6 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/debian/patches/002-remove-development-test-from-gemfile.patch b/debian/patches/002-remove-development-test-from-gemfile.patch
index 1ec862f..c8edb7f 100644
--- a/debian/patches/002-remove-development-test-from-gemfile.patch
+++ b/debian/patches/002-remove-development-test-from-gemfile.patch
@@ -11,10 +11,10 @@ Index: diaspora/Gemfile
- # Automatic test runs
- gem "guard-cucumber", "1.5.4"
- gem "guard-jshintrb", "1.1.1"
-- gem "guard-rspec", "4.6.3"
+- gem "guard-rspec", "4.6.4"
- gem "guard-rubocop", "1.2.0"
- gem "guard", "2.13.0", require: false
-- gem "rb-fsevent", "0.9.5", require: false
+- gem "rb-fsevent", "0.9.6", require: false
- gem "rb-inotify", "0.9.5", require: false
-
- # Linters
@@ -23,7 +23,7 @@ Index: diaspora/Gemfile
-
- # Preloading environment
-
-- gem "spring", "1.3.6"
+- gem "spring", "1.4.0"
- gem "spring-commands-rspec", "1.0.4"
- gem "spring-commands-cucumber", "1.0.1"
-
@@ -41,13 +41,13 @@ Index: diaspora/Gemfile
-
- gem "fixture_builder", "0.4.1"
- gem "fuubar", "2.0.0"
-- gem "rspec-instafail", "0.2.6", require: false
+- gem "rspec-instafail", "0.4.0", require: false
- gem "test_after_commit", "0.4.1"
-
- # Cucumber (integration tests)
-
-- gem "capybara", "2.4.4"
-- gem "database_cleaner" , "1.4.1"
+- gem "capybara", "2.5.0"
+- gem "database_cleaner" , "1.5.0"
- gem "selenium-webdriver", "2.47.1"
-
- # General helpers
@@ -66,7 +66,7 @@ Index: diaspora/Gemfile
- gem "cucumber-rails", "1.4.2", require: false
-
- # Jasmine (client side application tests (JS))
-- gem "jasmine", "2.2.0"
+- gem "jasmine", "2.3.1"
- gem "jasmine-jquery-rails", "2.0.3"
- gem "rails-assets-jasmine-ajax", "3.2.0", source: "https://rails-assets.org"
- gem "sinon-rails", "1.15.0"
diff --git a/debian/patches/007-loosen-roxml-version.patch b/debian/patches/007-loosen-roxml-version.patch
index 193b8b0..1585ec3 100644
--- a/debian/patches/007-loosen-roxml-version.patch
+++ b/debian/patches/007-loosen-roxml-version.patch
@@ -5,7 +5,7 @@ Index: 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 "twitter-text", "1.12.0"
+ gem "twitter-text", "1.13.0"
-gem "roxml", "3.1.6"
+gem "roxml", "~> 3.1"
gem "ruby-oembed", "0.8.14"
diff --git a/debian/patches/020-loosen-minor-versions.patch b/debian/patches/020-loosen-redcarpet.patch
similarity index 91%
rename from debian/patches/020-loosen-minor-versions.patch
rename to debian/patches/020-loosen-redcarpet.patch
index c94a2c3..0662d68 100644
--- a/debian/patches/020-loosen-minor-versions.patch
+++ b/debian/patches/020-loosen-redcarpet.patch
@@ -8,6 +8,6 @@ Index: diaspora/Gemfile
gem "nokogiri", "1.6.6.2"
-gem "redcarpet", "3.3.2"
+gem "redcarpet", "~> 3.2"
- gem "twitter-text", "1.12.0"
+ 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 61dce72..ae27587 100644
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ b/debian/patches/030-loosen-tiny-versions.patch
@@ -2,30 +2,26 @@ Index: diaspora/Gemfile
===================================================================
--- diaspora.orig/Gemfile
+++ diaspora/Gemfile
-@@ -54,9 +54,9 @@ gem "rack-cors", "0.4.0", require: "rack
- # CSS
+@@ -55,7 +55,7 @@ gem "rack-cors", "0.4.0", require: "rack
gem "bootstrap-sass", "2.3.2.2"
--gem "compass-rails", "2.0.4"
--gem "sass-rails", "5.0.1"
--gem "autoprefixer-rails", "5.2.1.1"
-+gem "compass-rails", "~> 2.0.4"
-+gem "sass-rails", "~> 5.0.1"
-+gem "autoprefixer-rails", "~> 5.2.1"
+ gem "compass-rails", "2.0.5"
+-gem "sass-rails", "5.0.4"
++gem "sass-rails", "5.0.3"
+ gem "autoprefixer-rails", "6.0.3"
# Database
-
@@ -91,7 +91,7 @@ gem "js_image_paths", "0.0.2"
- gem "js-routes", "1.0.1"
+ gem "js-routes", "1.1.2"
source "https://rails-assets.org" do
- 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", "4.4.0"
- gem "rails-assets-markdown-it-hashtag", "0.3.1"
+ gem "rails-assets-markdown-it", "5.0.0"
+ gem "rails-assets-markdown-it-hashtag", "0.4.0"
@@ -169,7 +169,7 @@ gem "gon", "6.0.1"
- gem "haml", "4.0.6"
+ gem "haml", "4.0.7"
gem "mobile-fu", "1.3.1"
gem "will_paginate", "3.0.7"
-gem "rails-timeago", "2.11.0"
diff --git a/debian/patches/031-embedded-gems.patch b/debian/patches/031-embedded-gems.patch
index 83487a8..7c720d2 100644
--- a/debian/patches/031-embedded-gems.patch
+++ b/debian/patches/031-embedded-gems.patch
@@ -8,6 +8,6 @@ Index: diaspora/Gemfile
-gem "bootstrap-sass", "2.3.2.2"
+gem "bootstrap-sass", "2.3.2.2", path: 'vendor/gems/bootstrap-sass-2.3.2.2'
- gem "compass-rails", "~> 2.0.4"
- gem "sass-rails", "~> 5.0.1"
- gem "autoprefixer-rails", "~> 5.2.1"
+ gem "compass-rails", "2.0.5"
+ gem "sass-rails", "5.0.3"
+ gem "autoprefixer-rails", "6.0.3"
diff --git a/debian/patches/series b/debian/patches/series
index 59fdd19..084f9f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,7 @@
007-loosen-roxml-version.patch
008-add-colorbox.patch
019-remove-diaspora-vines.patch
-020-loosen-minor-versions.patch
+020-loosen-redcarpet.patch
030-loosen-tiny-versions.patch
031-embedded-gems.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
More information about the Pkg-ruby-extras-commits
mailing list