[DRE-commits] [pry] 05/07: Refresh patches

[Youhei SASAKI]

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

uwabami-guest pushed a commit to branch master
in repository pry.

commit 3a164374383099d25e3f4f815ee152cb14127539
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Wed Aug 30 15:53:40 2017 +0900

    Refresh patches
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 ...2-Modify-upstream-spec-for-Debian-Package.patch | 23 ----------------------
 .../adjust-test-that-fails-on-debian-buildd.patch  | 11 +++++++++++
 debian/patches/dont-try-to-write-outside-build-dir | 18 +++++++++++++----
 debian/patches/series                              |  1 +
 debian/patches/test-suite-adjustments.patch        | 11 +++++++++++
 debian/patches/use-embedded-pry.patch              | 14 +++++++++++++
 6 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/debian/patches/0002-Modify-upstream-spec-for-Debian-Package.patch b/debian/patches/0002-Modify-upstream-spec-for-Debian-Package.patch
deleted file mode 100644
index 81226c1..0000000
--- a/debian/patches/0002-Modify-upstream-spec-for-Debian-Package.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Youhei SASAKI <uwabami at gfd-dennou.org>
-Date: Tue, 12 Aug 2014 19:50:15 +0900
-Subject: Modify upstream spec for Debian Package
-
-Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
----
- Rakefile       | 0
- spec/helper.rb | 9 +++------
- 2 files changed, 3 insertions(+), 6 deletions(-)
- create mode 100644 Rakefile
-
---- a/spec/helper.rb
-+++ b/spec/helper.rb
-@@ -1,6 +1,7 @@
--require 'bundler/setup'
- require 'pry/test/helper'
--Bundler.require :default, :test
-+require 'ostruct'
-+require 'bacon'
-+require 'mocha/api'
- require_relative 'spec_helpers/mock_pry'
- require_relative 'spec_helpers/repl_tester'
- 
diff --git a/debian/patches/adjust-test-that-fails-on-debian-buildd.patch b/debian/patches/adjust-test-that-fails-on-debian-buildd.patch
index c4558db..0af7757 100644
--- a/debian/patches/adjust-test-that-fails-on-debian-buildd.patch
+++ b/debian/patches/adjust-test-that-fails-on-debian-buildd.patch
@@ -1,3 +1,14 @@
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Wed, 30 Aug 2017 15:51:40 +0900
+Subject: adjust-test-that-fails-on-debian-buildd
+
+---
+ spec/pry_repl_spec.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/spec/pry_repl_spec.rb b/spec/pry_repl_spec.rb
+index 43c77ec..0fc01b9 100644
 --- a/spec/pry_repl_spec.rb
 +++ b/spec/pry_repl_spec.rb
 @@ -90,7 +90,7 @@ describe "The whole thing" do
diff --git a/debian/patches/dont-try-to-write-outside-build-dir b/debian/patches/dont-try-to-write-outside-build-dir
index 4ad27eb..bdb36c6 100644
--- a/debian/patches/dont-try-to-write-outside-build-dir
+++ b/debian/patches/dont-try-to-write-outside-build-dir
@@ -1,13 +1,23 @@
-Description: Don't try to write outside build dir
- Change the path of pry history file inside build dir, to prevent FTBFS.
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Wed, 30 Aug 2017 15:51:40 +0900
+Subject: dont-try-to-write-outside-build-dir
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
 
 Bug-Debian: https://bugs.debian.org/759900
 Forwarded: not-needed
 Author: David Suárez <david.sephirot at gmail.com>
 Last-Update: 2014-09-24
+---
+ spec/regression/readline_spec.rb | 4 ++++
+ 1 file changed, 4 insertions(+)
 
---- pry-0.10.1.orig/spec/regression/readline_spec.rb
-+++ pry-0.10.1/spec/regression/readline_spec.rb
+diff --git a/spec/regression/readline_spec.rb b/spec/regression/readline_spec.rb
+index 65427db..8298f32 100644
+--- a/spec/regression/readline_spec.rb
++++ b/spec/regression/readline_spec.rb
 @@ -21,19 +21,23 @@ describe "Readline" do
    it "is loaded on invoking 'pry'" do
      code = <<-RUBY
diff --git a/debian/patches/series b/debian/patches/series
index 1374f9b..6336654 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ dont-try-to-write-outside-build-dir
 use-embedded-pry.patch
 test-suite-adjustments.patch
 adjust-test-that-fails-on-debian-buildd.patch
+0005-Remove-git-ls-files-from-gemspec.patch
diff --git a/debian/patches/test-suite-adjustments.patch b/debian/patches/test-suite-adjustments.patch
index e73a3cc..f68b6c5 100644
--- a/debian/patches/test-suite-adjustments.patch
+++ b/debian/patches/test-suite-adjustments.patch
@@ -1,3 +1,14 @@
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Wed, 30 Aug 2017 15:51:40 +0900
+Subject: test-suite-adjustments
+
+---
+ spec/helper.rb | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/spec/helper.rb b/spec/helper.rb
+index 22fcd91..3b85c48 100644
 --- a/spec/helper.rb
 +++ b/spec/helper.rb
 @@ -1,6 +1,4 @@
diff --git a/debian/patches/use-embedded-pry.patch b/debian/patches/use-embedded-pry.patch
index 797990a..1fa469b 100644
--- a/debian/patches/use-embedded-pry.patch
+++ b/debian/patches/use-embedded-pry.patch
@@ -1,3 +1,15 @@
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Wed, 30 Aug 2017 15:51:40 +0900
+Subject: use-embedded-pry
+
+---
+ lib/pry.rb  | 2 +-
+ pry.gemspec | 1 -
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/lib/pry.rb b/lib/pry.rb
+index a8e81c0..bc3d078 100644
 --- a/lib/pry.rb
 +++ b/lib/pry.rb
 @@ -125,7 +125,7 @@ require 'method_source'
@@ -9,6 +21,8 @@
  require 'rbconfig'
  require 'tempfile'
  require 'pathname'
+diff --git a/pry.gemspec b/pry.gemspec
+index 7316cf7..fa760a5 100644
 --- a/pry.gemspec
 +++ b/pry.gemspec
 @@ -17,7 +17,6 @@ Gem::Specification.new do |s|

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