[DRE-commits] [ruby-zoom] 04/09: Drop already applied patch

[Lucas Moura]

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

lucasmoura-guest pushed a commit to branch master
in repository ruby-zoom.

commit 59854bdf086474f34ac0137bda9a75db27a65f8f
Author: Lucas Albuquerque Medeiros de Moura <lucas.moura128 at gmail.com>
Date:   Fri Jan 20 11:50:23 2017 -0200

    Drop already applied patch
---
 debian/changelog                        |  1 +
 debian/patches/fix_assert_in_test.patch | 17 -------
 debian/patches/ruby191.patch            | 88 ---------------------------------
 debian/patches/series                   |  2 -
 4 files changed, 1 insertion(+), 107 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ebfadb3..8fa27a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ruby-zoom (0.5.0-1) UNRELEASED; urgency=medium
   [ Lucas Albuquerque Medeiros de Moura ]
   * New upstream version 0.5.0
   * Bump standards-version to 3.9.8
+  * Drop already applied patch
 
  -- Cédric Boutillier <boutil at moszumanska.debian.org>  Fri, 20 Jan 2017 11:44:24 -0200
 
diff --git a/debian/patches/fix_assert_in_test.patch b/debian/patches/fix_assert_in_test.patch
deleted file mode 100644
index ea2c974..0000000
--- a/debian/patches/fix_assert_in_test.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix an error in a test script
- The test script in question fails using the new ruby-test-unit test suite
- as the first argument should always be a String, Proc or test object.
-Author: Paul van Tilburg <paulvt at debian.org>
-Last-Update: 2012-05-29
-
---- a/test/package_test.rb
-+++ b/test/package_test.rb
-@@ -31,7 +31,7 @@
-     #option correlationInfo.note
-       p = @connection.package
-       assert(p.respond_to?('correlation_info_note'))
--      assert(true, p.respond_to?('correlation_info_note='))
-+      assert(p.respond_to?('correlation_info_note='))
-       assert_equal(true, p.respond_to?('set_correlation_info_note'))
- 
-       p.correlation_info_note = 'correlation_info_note value'
diff --git a/debian/patches/ruby191.patch b/debian/patches/ruby191.patch
deleted file mode 100644
index ce23bd9..0000000
--- a/debian/patches/ruby191.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Description: ruby 1.9.1 / ruby 2.0 fixes
-Author: Brice Stacey <bricestacey at gmail.com>
-Origin: https://github.com/bricestacey/ruby-zoom
-
-diff --git a/src/extconf.rb b/src/extconf.rb
-index 001c588..41fef4f 100644
---- a/src/extconf.rb
-+++ b/src/extconf.rb
-@@ -2,12 +2,12 @@ require 'mkmf'
- 
- unless system('yaz-config')
-   $stderr.puts 'yaz does not appear to be installed'
--  break
-+  exit
- end
- 
- unless have_header('yaz/zoom.h')
-   $stderr.puts 'yaz zoom header not available'
--  break
-+  exit
- end
- 
- $CFLAGS << " #{`yaz-config --cflags`} "
-diff --git a/src/rbzoom.h b/src/rbzoom.h
-index 4dbf81c..8f47337 100644
---- a/src/rbzoom.h
-+++ b/src/rbzoom.h
-@@ -53,7 +53,7 @@ void rbz_connection_check(VALUE obj);
-         
- /* useful macros */
- #if !defined (RVAL2CSTR)
--# define RVAL2CSTR(x)       (NIL_P (x) ? NULL : STR2CSTR(x))
-+# define RVAL2CSTR(x)       (NIL_P (x) ? NULL : RSTRING_PTR(x))
- #endif
- #if !defined (CSTR2RVAL)
- # define CSTR2RVAL(x)       (x == NULL ? Qnil : rb_str_new2(x))
-diff --git a/src/rbzoomconnection.c b/src/rbzoomconnection.c
-index 1b85915..2049bbc 100644
---- a/src/rbzoomconnection.c
-+++ b/src/rbzoomconnection.c
-@@ -285,7 +285,7 @@ rbz_connection_package(VALUE self)
- {
-   ZOOM_connection connection;
-   ZOOM_options options;
--  ZOOM_package package;
-+  VALUE package;
- 
-   connection = rbz_connection_get (self);
-   options = ZOOM_options_create ();
-diff --git a/src/rbzoomoptions.c b/src/rbzoomoptions.c
-index 2a9b278..ec9fcf1 100644
---- a/src/rbzoomoptions.c
-+++ b/src/rbzoomoptions.c
-@@ -32,10 +32,10 @@ ruby_hash_to_zoom_options (VALUE hash)
-     options = ZOOM_options_create ();
-     
-     ary = rb_funcall (hash, rb_intern ("to_a"), 0);
--    for (i = 0; i < RARRAY (ary)->len; i++) {
--        pair = RARRAY (ary)->ptr[i];
--        key = RARRAY (pair)->ptr[0];
--        value = RARRAY (pair)->ptr[1];
-+    for (i = 0; i < RARRAY_LEN(ary); i++) {
-+        pair = RARRAY_PTR(ary)[i];
-+        key = RARRAY_PTR(pair)[0];
-+        value = RARRAY_PTR(pair)[1];
-         
-         switch (TYPE (value)) {
-             case T_TRUE:
-@@ -68,7 +68,7 @@ ruby_hash_to_zoom_options (VALUE hash)
- VALUE
- zoom_option_value_to_ruby_value (const char *value)
- {
--    int i;
-+    unsigned int i;
- 
-     if (value == NULL)
-         return Qnil; 
-@@ -86,8 +86,8 @@ define_zoom_option (VALUE klass, const char *option)
-     char code [1024];
-     char rubyname [128];
-     char c;
--    int i;
--    int j;
-+    unsigned int i;
-+    unsigned int j;
-    
-     /* rubyfy the option name */
-     for (i = 0, j = 0; i < strlen (option) && j < sizeof rubyname; i++, j++) {
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 66b0a50..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-fix_assert_in_test.patch
-ruby191.patch

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