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

[Daigo Moriwaki]

The following commit has been merged in the master branch:
commit 62f4704c7d5c6032daf5ee51dbf6b1b1789869ef
Author: Daigo Moriwaki <daigo at debian.org>
Date:   Sun Jun 5 22:33:26 2011 +0900

    Reverted 17de2347d397972358a802602df44801693126ba.

diff --git a/debian/changelog b/debian/changelog
index b6ad5ae..89b60f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ libgsl-ruby (1.14.3-2) unstable; urgency=low
     - Followed the NArray package name change from libnarray-ruby to
       ruby-narray.
     - Build-Depends libtamuanova-dev to build a related module.
-  * debian/patches/003_config: Added a patch to restore completely.
-    (Closes: #628264)
+  * Restore completely: (Closes: #628264) 
+    - debian/patches/003_config: Added a patch
+    - debian/rb_gsl_config.h: Copied from the upstream source
+      to restore.
   * Added patches to work around build failure:
     - debian/patches/20110605_matrix_complex.c
     - debian/patches/20110605_vector_complex.c
diff --git a/debian/patches/003_config b/debian/patches/003_config
index d3b3f6e..cdda83e 100644
--- a/debian/patches/003_config
+++ b/debian/patches/003_config
@@ -14,25 +14,3 @@ Index: ruby-gsl/lib/rbgsl.rb
 +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/include/rb_gsl_config.h b/debian/rb_gsl_config.h
similarity index 100%
copy from include/rb_gsl_config.h
copy to debian/rb_gsl_config.h
diff --git a/debian/rules b/debian/rules
index 08bac6a..a32115d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,3 +24,9 @@ binary-install/libgsl-ruby-doc::
 	rm -rf debian/libgsl-ruby-doc/usr/share/doc/libgsl-ruby-doc/examples/gallery/rgplot/rgplot.replaced
 	chmod a-x debian/libgsl-ruby-doc/usr/share/doc/libgsl-ruby-doc/examples/integration/cosmology.rb
 
+clean::
+	cp debian/rb_gsl_config.h include/rb_gsl_config.h
+
+prepare-new-upstream-version:
+	cp include/rb_gsl_config.h debian/rb_gsl_config.h
+

-- 
ruby-gsl.git