[DRE-commits] [ruby-gsl] 05/10: refresh patches 20110605_extconf.rb and 20130815_deprecated_enum.patch

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-gsl.

commit 008180c91b815b8912077ef66518aeb0398e482c
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Oct 16 17:53:47 2013 +0200

    refresh patches 20110605_extconf.rb and 20130815_deprecated_enum.patch
---
 debian/patches/20110605_extconf.rb            |   14 ++++++++------
 debian/patches/20130815_deprecated_enum.patch |   24 +++++++++++++-----------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/debian/patches/20110605_extconf.rb b/debian/patches/20110605_extconf.rb
index 0e57b10..0d9f29e 100644
--- a/debian/patches/20110605_extconf.rb
+++ b/debian/patches/20110605_extconf.rb
@@ -1,8 +1,10 @@
-Index: ruby-gsl/ext/extconf.rb
-===================================================================
---- ruby-gsl.orig/ext/extconf.rb	2011-06-05 20:57:36.000000000 +0900
-+++ ruby-gsl/ext/extconf.rb	2011-06-05 20:58:59.000000000 +0900
-@@ -234,7 +234,7 @@
+Description: install in $vendorarchdir according to Debian Ruby Policy
+Origin: vendor
+Last-Update: 2013-10-16
+
+--- a/ext/extconf.rb
++++ b/ext/extconf.rb
+@@ -243,7 +243,7 @@
  end
  
  #narray_config = dir_config("narray")
@@ -11,7 +13,7 @@ Index: ruby-gsl/ext/extconf.rb
  # Try to find narray with RubyGems
  begin
    require 'rubygems'
-@@ -253,7 +253,7 @@
+@@ -262,7 +262,7 @@
    end
  end
  
diff --git a/debian/patches/20130815_deprecated_enum.patch b/debian/patches/20130815_deprecated_enum.patch
index 086d718..8d76043 100644
--- a/debian/patches/20130815_deprecated_enum.patch
+++ b/debian/patches/20130815_deprecated_enum.patch
@@ -1,8 +1,12 @@
-diff --git a/ext/fft.c b/ext/fft.c
-index 9fd76d8..f65ded2 100644
+Description: rename deprecated enum
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718070
+Origin: vendor
+Author: Guillaume Bouteille <duffman at gb2n.org>
+Last-Update: 2013-10-16
+
 --- a/ext/fft.c
 +++ b/ext/fft.c
-@@ -897,10 +897,10 @@ void Init_gsl_fft(VALUE module)
+@@ -907,10 +907,10 @@
  
    /*****/
  
@@ -17,11 +21,9 @@ index 9fd76d8..f65ded2 100644
  
    /* Transforms for complex vectors */
    rb_define_method(cgsl_vector_complex, "radix2_forward", 
-diff --git a/ext/wavelet.c b/ext/wavelet.c
-index 82197d9..6ced49e 100644
 --- a/ext/wavelet.c
 +++ b/ext/wavelet.c
-@@ -152,10 +152,10 @@ static void rb_gsl_wavelet_define_const(VALUE klass)
+@@ -152,10 +152,10 @@
    rb_define_const(klass, "BSPLINE", INT2FIX(GSL_WAVELET_BSPLINE));
    rb_define_const(klass, "BSPLINE_CENTERED", INT2FIX(GSL_WAVELET_BSPLINE_CENTERED));
    /*****/
@@ -36,16 +38,16 @@ index 82197d9..6ced49e 100644
  }
  
  static VALUE rb_gsl_wavelet_name(VALUE ww)
-@@ -191,7 +191,7 @@ static VALUE rb_gsl_wavelet_transform0(int argc, VALUE *argv, VALUE obj,
+@@ -191,7 +191,7 @@
  {
    gsl_wavelet *w = NULL;
    gsl_vector *v = NULL, *vnew;
 -  gsl_wavelet_direction dir = forward;
 +  gsl_wavelet_direction dir = gsl_wavelet_forward;
    gsl_wavelet_workspace *work = NULL;
-   int itmp, flag = 0, status;
-   double *ptr1, *ptr2;
-@@ -527,7 +527,7 @@ static VALUE rb_gsl_wavelet2d(int argc, VALUE *argv, VALUE obj,
+   int itmp, flag = 0;
+   // local variable "status" declared and set, but never used
+@@ -531,7 +531,7 @@
  {
    gsl_wavelet *w = NULL;
    gsl_matrix *m = NULL, *mnew;
@@ -53,4 +55,4 @@ index 82197d9..6ced49e 100644
 +  gsl_wavelet_direction dir = gsl_wavelet_forward;
    gsl_wavelet_workspace *work = NULL;
    VALUE ary, ret;
-   int itmp, flag = 0, status;
+   int itmp, flag = 0;

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