[DRE-commits] [SCM] ruby-gsl.git branch, master, updated. 62f4704c7d5c6032daf5ee51dbf6b1b1789869ef

[Daigo Moriwaki]

The following commit has been merged in the master branch:
commit 193c8a54665d4947c99d5c28291caca7d40cfe9b
Author: Daigo Moriwaki <daigo at debian.org>
Date:   Sun Jun 5 20:48:20 2011 +0900

    * Added patches to work around build failure:
      - debian/patches/20110605_matrix_complex.c
      - debian/patches/20110605_vector_complex.c

diff --git a/debian/changelog b/debian/changelog
index 31d1263..1c8ae13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libgsl-ruby (1.14.3-2) unstable; urgency=low
+
+  * Added patches to work around build failure:
+    - debian/patches/20110605_matrix_complex.c
+    - debian/patches/20110605_vector_complex.c
+
+ -- Daigo Moriwaki <daigo at debian.org>  Sun, 05 Jun 2011 20:45:57 +0900
+
 libgsl-ruby (1.14.3-1) unstable; urgency=low
 
   [ Deepak Tripathi ]
diff --git a/debian/patches/20110605_matrix_complex.c b/debian/patches/20110605_matrix_complex.c
new file mode 100644
index 0000000..fb257fb
--- /dev/null
+++ b/debian/patches/20110605_matrix_complex.c
@@ -0,0 +1,22 @@
+Index: ruby-gsl/ext/matrix_complex.c
+===================================================================
+--- ruby-gsl.orig/ext/matrix_complex.c	2011-06-05 20:42:48.000000000 +0900
++++ ruby-gsl/ext/matrix_complex.c	2011-06-05 20:43:12.000000000 +0900
+@@ -1520,7 +1520,7 @@
+ }
+ 
+ 
+-static int gsl_matrix_complex_equal(const gsl_matrix_complex *m1,
++static int gsl_matrix_complex_equal_eps(const gsl_matrix_complex *m1,
+   const gsl_matrix_complex *m2, double eps)
+ {
+   gsl_complex z1, z2;
+@@ -1555,7 +1555,7 @@
+   Data_Get_Struct(obj, gsl_matrix_complex, m1);
+   CHECK_MATRIX_COMPLEX(argv[0]);
+   Data_Get_Struct(argv[0], gsl_matrix_complex, m2);
+-  ret = gsl_matrix_complex_equal(m1, m2, eps);
++  ret = gsl_matrix_complex_equal_eps(m1, m2, eps);
+   if (ret == 1) return Qtrue;
+   else return Qfalse;
+ }
diff --git a/debian/patches/20110605_vector_complex.c b/debian/patches/20110605_vector_complex.c
new file mode 100644
index 0000000..488ee32
--- /dev/null
+++ b/debian/patches/20110605_vector_complex.c
@@ -0,0 +1,22 @@
+Index: ruby-gsl/ext/vector_complex.c
+===================================================================
+--- ruby-gsl.orig/ext/vector_complex.c	2011-06-05 20:41:34.000000000 +0900
++++ ruby-gsl/ext/vector_complex.c	2011-06-05 20:42:13.000000000 +0900
+@@ -1986,7 +1986,7 @@
+   return ary;
+ }
+ 
+-static int gsl_vector_complex_equal(const gsl_vector_complex *v1,
++static int gsl_vector_complex_equal_eps(const gsl_vector_complex *v1,
+   const gsl_vector_complex *v2, double eps)
+ {
+   gsl_complex z1, z2;
+@@ -2019,7 +2019,7 @@
+   Data_Get_Struct(obj, gsl_vector_complex, v1);
+   CHECK_VECTOR_COMPLEX(argv[0]);
+   Data_Get_Struct(argv[0], gsl_vector_complex, v2);
+-  ret = gsl_vector_complex_equal(v1, v2, eps);
++  ret = gsl_vector_complex_equal_eps(v1, v2, eps);
+   if (ret == 1) return Qtrue;
+   else return Qfalse;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 9967f03..db6ea9f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 002_min.c.patch
 001_adding_bash.patch
+20110605_vector_complex.c
+20110605_matrix_complex.c

-- 
ruby-gsl.git