[DRE-commits] [ruby-actionpack-action-caching] 01/06: Drop debian/patches/dont-use-bundler-in-tests.patc

[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 c668c6ba58d71f6bbae3053083934bc5b2a760ab
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Dec 14 08:52:44 2015 -0200

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

diff --git a/debian/changelog b/debian/changelog
index d219f86..97f8ffb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-actionpack-action-caching (1.1.1-4) UNRELEASED; urgency=medium
+
+  * Drop debian/patches/dont-use-bundler-in-tests.patch
+    - added bundler to Build-Depends:
+
+ -- Antonio Terceiro <terceiro at debian.org>  Mon, 14 Dec 2015 08:52:22 -0200
+
 ruby-actionpack-action-caching (1.1.1-3) unstable; urgency=medium
 
   * Breaks/Replaces against ruby-actionpack-2.3, ruby-actionpack-3.2 to
diff --git a/debian/control b/debian/control
index 9089912..2218454 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +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: debhelper (>= 7.0.50~), gem2deb (>= 0.9.0~), ruby-mocha, ruby-rails, rake
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.9.0~), ruby-mocha, ruby-rails, rake, bundler
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-actionpack-action-caching.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-actionpack-action-caching.git;a=summary
diff --git a/debian/patches/dont-use-bundler-in-tests.patch b/debian/patches/dont-use-bundler-in-tests.patch
deleted file mode 100644
index 4e64995..0000000
--- a/debian/patches/dont-use-bundler-in-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index 4e408c5..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-dont-use-bundler-in-tests.patch

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