[DRE-commits] [ruby-actionpack-action-caching] 06/06: re-add dont-use-bundler-in-tests.patch

[Antonio Terceiro]

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

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

commit 64bb7f218ef56a78b466d7a38b9293368beb05fd
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Dec 14 09:17:21 2015 -0200

    re-add dont-use-bundler-in-tests.patch
---
 debian/changelog                               |  2 --
 debian/control                                 |  3 +--
 debian/patches/dont-use-bundler-in-tests.patch | 15 +++++++++++++++
 debian/patches/series                          |  1 +
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 90db0af..6406206 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,5 @@
 ruby-actionpack-action-caching (1.1.1-4) unstable; urgency=medium
 
-  * Drop debian/patches/dont-use-bundler-in-tests.patch
-    - added bundler to Build-Depends:
   * debian/copyright: fill in Source: URL
   * Add debian/patches/Fix-Failing-Tests.patch, from upstream
   * Update packaging with a new dh-make-ruby run
diff --git a/debian/control b/debian/control
index a913a23..b8e5926 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Antonio Terceiro <terceiro at debian.org>
-Build-Depends: bundler,
-               debhelper (>= 9~),
+Build-Depends: debhelper (>= 9~),
                gem2deb,
                rake,
                ruby-actionpack (<< 2:5.0),
diff --git a/debian/patches/dont-use-bundler-in-tests.patch b/debian/patches/dont-use-bundler-in-tests.patch
new file mode 100644
index 0000000..4e64995
--- /dev/null
+++ b/debian/patches/dont-use-bundler-in-tests.patch
@@ -0,0 +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'
+--- a/Rakefile
++++ b/Rakefile
+@@ -1,5 +1,4 @@
+ #!/usr/bin/env rake
+-require 'bundler/gem_tasks'
+ require 'rake/testtask'
+ 
+ Rake::TestTask.new do |t|
diff --git a/debian/patches/series b/debian/patches/series
index fed429b..acc7bda 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+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