[DRE-commits] [ruby-grib] 03/07: Refresh patch: Drop obsolete patches (merge upstream)

[Youhei SASAKI]

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

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

commit ce75f011e73624fa048a340ebdd00881cecb6271
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Mon Jun 20 21:49:05 2016 +0900

    Refresh patch: Drop obsolete patches (merge upstream)
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/patches/0001-Fix-RSpec-LOAD_PATH.patch     |  2 +-
 debian/patches/0002-Ad-hoc-fix-Hardening.patch    | 22 ----------------------
 debian/patches/0003-Fix_read_spec_true_test.patch | 18 ------------------
 debian/patches/series                             |  2 --
 4 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/debian/patches/0001-Fix-RSpec-LOAD_PATH.patch b/debian/patches/0001-Fix-RSpec-LOAD_PATH.patch
index 71ba960..d731295 100644
--- a/debian/patches/0001-Fix-RSpec-LOAD_PATH.patch
+++ b/debian/patches/0001-Fix-RSpec-LOAD_PATH.patch
@@ -4,7 +4,7 @@ Date: Sun, 17 Jun 2012 17:37:56 +0900
 Subject: Fix RSpec LOAD_PATH
 
 ---
- spec/spec_helper.rb |   14 +++++++-------
+ spec/spec_helper.rb | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
diff --git a/debian/patches/0002-Ad-hoc-fix-Hardening.patch b/debian/patches/0002-Ad-hoc-fix-Hardening.patch
deleted file mode 100644
index b9ebb8a..0000000
--- a/debian/patches/0002-Ad-hoc-fix-Hardening.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Youhei SASAKI <uwabami at gfd-dennou.org>
-Date: Tue, 12 Jun 2012 10:02:04 +0900
-Subject: Ad hoc fix Hardening
-
-Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
----
- ext/grib.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ext/grib.c b/ext/grib.c
-index 1cf886a..53ee66c 100644
---- a/ext/grib.c
-+++ b/ext/grib.c
-@@ -11,7 +11,7 @@
- static void
- check_error(int code)
- {
--  if (code) rb_raise(rb_eRuntimeError, grib_get_error_message(code));
-+  if (code) rb_raise(rb_eRuntimeError, "%s", grib_get_error_message(code));
- };
- 
- 
diff --git a/debian/patches/0003-Fix_read_spec_true_test.patch b/debian/patches/0003-Fix_read_spec_true_test.patch
deleted file mode 100644
index 87e41ab..0000000
--- a/debian/patches/0003-Fix_read_spec_true_test.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Fix for test syntax
-Last-Updated: 2015-07-15
-Forwarded: no
-
-Index: ruby-grib-0.2.2/spec/grib_read_spec.rb
-===================================================================
---- ruby-grib-0.2.2.orig/spec/grib_read_spec.rb
-+++ ruby-grib-0.2.2/spec/grib_read_spec.rb
-@@ -48,7 +48,7 @@ describe NumRu::Grib do
-   describe 'Grib.is_a_Grib?' do
-     it 'returns whether the specific file is a GRIB1/2 file' do
-       GribData.each do |fname, hash|
--        NumRu::Grib.is_a_Grib?(fname).should be_true
-+        NumRu::Grib.is_a_Grib?(fname).should be true
-       end
-     end
-   end
diff --git a/debian/patches/series b/debian/patches/series
index c255094..de3ce59 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 0001-Fix-RSpec-LOAD_PATH.patch
-0002-Ad-hoc-fix-Hardening.patch
-0003-Fix_read_spec_true_test.patch

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