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

[Daigo Moriwaki]

The following commit has been merged in the master branch:
commit 3ce16d9fc9a284f085770bf97565f686849e1bd1
Author: Daigo Moriwaki <daigo at debian.org>
Date:   Sun Jun 5 21:24:40 2011 +0900

      - Followed the NArray package name change from libnarray-ruby to
        ruby-narray.
    * debian/patches/003_config: Added a patch to restore completely.
      (Closes: #628264)
    * debian/patches/20110605_extconf.rb: Added a patch to find narra.h
      correctly.

diff --git a/debian/changelog b/debian/changelog
index 680c7a0..b6ad5ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,15 +3,16 @@ libgsl-ruby (1.14.3-2) unstable; urgency=low
   * debian/control:
     - Moved Debian repository from svn to git.
     - Bumped up Standards-Version to 3.9.2.
-    - Followed the NArray package name change from libnarray-ruby to ruby-narray.
+    - Followed the NArray package name change from libnarray-ruby to
+      ruby-narray.
     - Build-Depends libtamuanova-dev to build a related module.
-  * debian/rb_gsl_config.h: Copied from the upstrea source to restore
-    completely. (Closes: #628264)
+  * debian/patches/003_config: Added a patch to restore completely.
+    (Closes: #628264)
   * 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
+  * debian/patches/20110605_extconf.rb: Added a patch to find narra.h
+    correctly.
 
  -- Daigo Moriwaki <daigo at debian.org>  Sun, 05 Jun 2011 20:45:57 +0900
 
diff --git a/debian/patches/003_config b/debian/patches/003_config
new file mode 100644
index 0000000..d3b3f6e
--- /dev/null
+++ b/debian/patches/003_config
@@ -0,0 +1,38 @@
+Index: ruby-gsl/lib/gsl.rb
+===================================================================
+--- ruby-gsl.orig/lib/gsl.rb	2011-06-05 21:17:24.000000000 +0900
++++ ruby-gsl/lib/gsl.rb	2011-06-05 21:18:27.000000000 +0900
+@@ -1,2 +1,3 @@
++require('narray')
+ require('rb_gsl')
+ require('gsl/oper.rb')
+Index: ruby-gsl/lib/rbgsl.rb
+===================================================================
+--- ruby-gsl.orig/lib/rbgsl.rb	2011-06-05 21:17:24.000000000 +0900
++++ ruby-gsl/lib/rbgsl.rb	2011-06-05 21:18:27.000000000 +0900
+@@ -1,2 +1,3 @@
++require('narray')
+ require('rb_gsl')
+ require('gsl/oper.rb')
+Index: ruby-gsl/include/rb_gsl_config.h
+===================================================================
+--- ruby-gsl.orig/include/rb_gsl_config.h	2011-06-05 21:18:35.000000000 +0900
++++ ruby-gsl/include/rb_gsl_config.h	2011-06-05 21:19:13.000000000 +0900
+@@ -2,7 +2,7 @@
+ #define ___RB_GSL_CONFIG_H___
+ 
+ #ifndef GSL_VERSION
+-#define GSL_VERSION "1.14"
++#define GSL_VERSION "1.15"
+ #endif
+ #ifndef GSL_0_9_4_LATER
+ #define GSL_0_9_4_LATER
+@@ -61,8 +61,5 @@
+ #ifndef HAVE_GNU_GRAPH
+ #define HAVE_GNU_GRAPH
+ #endif
+-#ifndef RUBY_1_9_LATER
+-#define RUBY_1_9_LATER
+-#endif
+ 
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index df6ceb1..68fd99e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 20110605_vector_complex.c
 20110605_matrix_complex.c
 20110605_extconf.rb
+003_config

-- 
ruby-gsl.git