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

[Daigo Moriwaki]

The following commit has been merged in the master branch:
commit 7819e448ff823252e506bbb49115604995f8ee41
Author: Daigo Moriwaki <daigo at debian.org>
Date:   Sun Jun 5 21:01:18 2011 +0900

    * Added a patch to find narra.h correctly:
      - debian/patches/20110605_extconf.rb

diff --git a/debian/changelog b/debian/changelog
index 9da5014..11d419c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ 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
+  * Added a patch to find narra.h correctly:
+    - debian/patches/20110605_extconf.rb
 
  -- Daigo Moriwaki <daigo at debian.org>  Sun, 05 Jun 2011 20:45:57 +0900
 
diff --git a/debian/patches/20110605_extconf.rb b/debian/patches/20110605_extconf.rb
new file mode 100644
index 0000000..0e57b10
--- /dev/null
+++ b/debian/patches/20110605_extconf.rb
@@ -0,0 +1,22 @@
+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 @@
+ end
+ 
+ #narray_config = dir_config("narray")
+-narray_config = dir_config('narray',$sitearchdir,$sitearchdir)
++narray_config = dir_config('narray',$vendorarchdir,$vendorarchdir)
+ # Try to find narray with RubyGems
+ begin
+   require 'rubygems'
+@@ -253,7 +253,7 @@
+   end
+ end
+ 
+-tamu_anova_config = dir_config('tamu_anova',$sitearchdir,$sitearchdir)
++tamu_anova_config = dir_config('tamu_anova',$vendorarchdir,$vendorarchdir)
+ have_tamu_anova_h = have_header("tamu_anova/tamu_anova.h")
+ if tamu_anova_config
+   have_library("tamuanova")
diff --git a/debian/patches/series b/debian/patches/series
index db6ea9f..df6ceb1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 001_adding_bash.patch
 20110605_vector_complex.c
 20110605_matrix_complex.c
+20110605_extconf.rb

-- 
ruby-gsl.git