[DRE-commits] [ruby-neovim] 03/05: refresh patches, update changelog

[Jason Pleau]

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

jpleau-guest pushed a commit to branch master
in repository ruby-neovim.

commit b68c7d56722778bf208fc99bf991eeeea968193a
Author: Jason Pleau <jason at jpleau.ca>
Date:   Sat Jul 15 10:42:12 2017 -0400

    refresh patches, update changelog
    
    Refreshed patch remove_coveralls_pry_bundler.patch
    
    Removed patches no longer needed:
      -disable_failing_test_schroot.patch
      -fix_current_window_test.patch
---
 debian/changelog                                  |  4 ++++
 debian/patches/disable_failing_test_schroot.patch | 29 -----------------------
 debian/patches/fix_current_window_test.patch      | 29 -----------------------
 debian/patches/remove_coveralls_pry_bundler.patch |  1 +
 debian/patches/series                             |  2 --
 5 files changed, 5 insertions(+), 60 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5459305..c9405a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 ruby-neovim (0.5.0-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Refreshed patch remove_coveralls_pry_bundler.patch
+  * Removed patches no longer needed:
+    - disable_failing_test_schroot.patch
+    - fix_current_window_test.patch
 
  -- Jason Pleau <jason at jpleau.ca>  Sat, 15 Jul 2017 10:40:43 -0400
 
diff --git a/debian/patches/disable_failing_test_schroot.patch b/debian/patches/disable_failing_test_schroot.patch
deleted file mode 100644
index 7432113..0000000
--- a/debian/patches/disable_failing_test_schroot.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Disable the 'fails when attached to a TTY test'
- The tests fails when building in a chroot, see debian bug #817236
- for more info.
-Author: Jason Pleau <jason at jpleau.ca>
-
---- a/spec/acceptance/neovim-ruby-host_spec.rb
-+++ b/spec/acceptance/neovim-ruby-host_spec.rb
-@@ -14,14 +14,14 @@
-     end
-   end
- 
--  it "fails when attached to a TTY" do
--    PTY.spawn(host_exe) do |rd, wr, pid|
--      expect(rd.gets).to match(/can't run.+interactively/i)
-+  #it "fails when attached to a TTY" do
-+  #  PTY.spawn(host_exe) do |rd, wr, pid|
-+  #    expect(rd.gets).to match(/can't run.+interactively/i)
- 
--      _, status = Process.waitpid2(pid)
--      expect(status.exitstatus).to be(1)
--    end
--  end
-+  #    _, status = Process.waitpid2(pid)
-+  #    expect(status.exitstatus).to be(1)
-+  #  end
-+  #end
- 
-   it "loads and runs plugins from Ruby source files" do
-     plugin_path = Support.file_path("plugin1.rb")
diff --git a/debian/patches/fix_current_window_test.patch b/debian/patches/fix_current_window_test.patch
deleted file mode 100644
index 374479f..0000000
--- a/debian/patches/fix_current_window_test.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6ed635df885f2cbd5794de4cc523b3bdace9986d Mon Sep 17 00:00:00 2001
-From: Alex Genco <alexgenco at gmail.com>
-Date: Sun, 4 Dec 2016 19:22:09 -0800
-Subject: [PATCH] Fix Current#window= spec to use relative indices
-
----
- spec/neovim/current_spec.rb | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/spec/neovim/current_spec.rb b/spec/neovim/current_spec.rb
-index 823952d..6c78703 100644
---- a/spec/neovim/current_spec.rb
-+++ b/spec/neovim/current_spec.rb
-@@ -69,12 +69,12 @@ module Neovim
- 
-     describe "#window=" do
-       it "sets the current window from an integer" do
-+        start_index = current.window.index
-         client.command("vsp")
--        expect(current.window.index).not_to eq(1)
- 
-         expect {
--          current.window = 1
--        }.to change { current.window.index }.to(1)
-+          current.window = start_index
-+        }.to change { current.window.index }.to(start_index)
-       end
- 
-       it "sets the current window from a Window" do
diff --git a/debian/patches/remove_coveralls_pry_bundler.patch b/debian/patches/remove_coveralls_pry_bundler.patch
index 8ffaec0..73f0e0f 100644
--- a/debian/patches/remove_coveralls_pry_bundler.patch
+++ b/debian/patches/remove_coveralls_pry_bundler.patch
@@ -25,5 +25,6 @@ Last-Update: 2016-12-04
  require "neovim"
 -require "pry"
 +#require "pry"
+ require "rubygems"
  require "stringio"
  require "timeout"
diff --git a/debian/patches/series b/debian/patches/series
index 1cb5404..c41bd71 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-disable_failing_test_schroot.patch
-fix_current_window_test.patch
 remove_coveralls_pry_bundler.patch

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