[DRE-commits] [schleuder] 07/13: debian/patches: Drop patch to disable bundler, integrated upstream

[Georg Faerber]

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

georg-alioth-guest pushed a commit to branch master
in repository schleuder.

commit a92214fa72bd9b6591aeea50f6cf7cc79ca5eca5
Author: Georg Faerber <georg at riseup.net>
Date:   Mon Oct 23 12:04:50 2017 +0200

    debian/patches: Drop patch to disable bundler, integrated upstream
---
 debian/patches/0004-spec-remove-bundler.patch | 18 ------------------
 debian/patches/series                         |  1 -
 2 files changed, 19 deletions(-)

diff --git a/debian/patches/0004-spec-remove-bundler.patch b/debian/patches/0004-spec-remove-bundler.patch
deleted file mode 100644
index 9dafdcc..0000000
--- a/debian/patches/0004-spec-remove-bundler.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: spec/: Remove bundler usage
- We don't need bundler, because we're using packages. 
- Upstream is aware of this patch and we're working on integrating it.
-Author: Georg Faerber <georg at riseup.net>
-Last-Update: 2017-01-26
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -1,8 +1,6 @@
- ENV['SCHLEUDER_ENV'] ||= 'test'
- ENV['SCHLEUDER_CONFIG'] = 'spec/schleuder.yml'
- ENV["SCHLEUDER_LIST_DEFAULTS"] = "etc/list-defaults.yml"
--require 'bundler/setup'
--Bundler.setup
- require 'schleuder'
- require 'schleuder/cli'
- require 'database_cleaner'
diff --git a/debian/patches/series b/debian/patches/series
index 364ec50..4b15d68 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 0005-man-fix-log-path.patch
 0001-lib-fix-paths.patch
-0004-spec-remove-bundler.patch
 0003-bin-fix-require.patch
 0002-etc-fix-paths.patch

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