[DRE-commits] [ruby-dotenv] 04/05: drop 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-dotenv.

commit 402b33d8935426a71ad169cbddfcd6c1b0007765
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Aug 1 14:42:59 2017 -0300

    drop patch
---
 debian/changelog                                   |  2 ++
 ...ser_spec-don-t-assume-being-run-with-ruby.patch | 37 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bc4fa63..579fc2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ ruby-dotenv (2.2.1-1) UNRELEASED; urgency=medium
     - Bump debhelper compatibility level to 10
     - Set `Testsuite:` to `autopkgtest-pkg-ruby`
   * Drop explicit debian/tests/control, not needed anymore
+  * Drop debian/patches/*. There was only a single patch, and the original
+    issue has been fixed differently by upstream.
 
  -- Antonio Terceiro <terceiro at debian.org>  Tue, 01 Aug 2017 14:32:03 -0300
 
diff --git a/debian/patches/0001-parser_spec-don-t-assume-being-run-with-ruby.patch b/debian/patches/0001-parser_spec-don-t-assume-being-run-with-ruby.patch
deleted file mode 100644
index d79cd10..0000000
--- a/debian/patches/0001-parser_spec-don-t-assume-being-run-with-ruby.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 8032f8881808084381451b75e9cf65a6974e9b0e Mon Sep 17 00:00:00 2001
-From: Antonio Terceiro <terceiro at softwarelivre.org>
-Date: Thu, 10 Sep 2015 19:28:57 -0300
-Subject: [PATCH] parser_spec: don't assume being run with `ruby`
-
-On Debian unstable there are two Ruby interpreters available during
-transitions, and for QA purposes we always run tests during build for
-all Ruby versions. When running under the one that is not the default,
-the output of `ruby -v` will never match RUBY_DESCRIPTION.
----
- spec/dotenv/parser_spec.rb | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/spec/dotenv/parser_spec.rb b/spec/dotenv/parser_spec.rb
-index e0345fb..111cfe2 100644
---- a/spec/dotenv/parser_spec.rb
-+++ b/spec/dotenv/parser_spec.rb
-@@ -125,12 +125,14 @@ export OH_NO_NOT_SET')
-   end
- 
-   if RUBY_VERSION > "1.8.7"
-+    ruby = RbConfig::CONFIG['RUBY_INSTALL_NAME']
-+
-     it "parses shell commands interpolated in $()" do
--      expect(env("ruby_v=$(ruby -v)")).to eql("ruby_v" => RUBY_DESCRIPTION)
-+      expect(env("ruby_v=$(#{ruby} -v)")).to eql("ruby_v" => RUBY_DESCRIPTION)
-     end
- 
-     it "allows balanced parentheses within interpolated shell commands" do
--      expect(env('ruby_v=$(echo "$(echo "$(echo "$(ruby -v)")")")'))
-+      expect(env('ruby_v=$(echo "$(echo "$(echo "$(' + ruby + ' -v)")")")'))
-         .to eql("ruby_v" => RUBY_DESCRIPTION)
-     end
- 
--- 
-2.5.1
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9eca658..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-parser_spec-don-t-assume-being-run-with-ruby.patch

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