[DRE-commits] [ruby-actionpack-action-caching] 05/08: patch management for new version

[Marc Dequènes]

This is an automated email from the git hooks/post-receive script.

duck pushed a commit to branch master
in repository ruby-actionpack-action-caching.

commit 843bb340fe0b4f71eb52af7a8c05e01a7ed01db0
Author: Marc Dequènes (Duck) <Duck at DuckCorp.org>
Date:   Tue Sep 12 01:24:02 2017 +0900

    patch management for new version
---
 debian/changelog                               |  2 ++
 debian/patches/dont-use-bundler-in-tests.patch | 12 ++++++------
 debian/patches/series                          |  1 -
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8295772..2217748 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ruby-actionpack-action-caching (1.2.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Added myself to uploaders.
+  * Removed Fix-Failing-Tests.patch applied upstream.
+  * Refreshed remaining patches.
 
  -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Tue, 12 Sep 2017 01:14:20 +0900
 
diff --git a/debian/patches/dont-use-bundler-in-tests.patch b/debian/patches/dont-use-bundler-in-tests.patch
index 4e64995..deb12df 100644
--- a/debian/patches/dont-use-bundler-in-tests.patch
+++ b/debian/patches/dont-use-bundler-in-tests.patch
@@ -1,15 +1,15 @@
 --- a/test/abstract_unit.rb
 +++ b/test/abstract_unit.rb
 @@ -1,4 +1,3 @@
--require 'bundler/setup'
- require 'minitest/autorun'
- require 'action_controller'
- require 'active_record'
+-require "bundler/setup"
+ require "minitest/autorun"
+ require "action_controller"
+ require "active_record"
 --- a/Rakefile
 +++ b/Rakefile
 @@ -1,5 +1,4 @@
  #!/usr/bin/env rake
--require 'bundler/gem_tasks'
- require 'rake/testtask'
+-require "bundler/gem_tasks"
+ require "rake/testtask"
  
  Rake::TestTask.new do |t|
diff --git a/debian/patches/series b/debian/patches/series
index acc7bda..4e408c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 dont-use-bundler-in-tests.patch
-Fix-Failing-Tests.patch

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