[DRE-commits] [SCM] ruby-gsl.git branch, master, updated. 69c0f685af15c99bd939f325367fc3b42e4025cd

[Daigo Moriwaki]

The following commit has been merged in the master branch:
commit 69c0f685af15c99bd939f325367fc3b42e4025cd
Author: Daigo Moriwaki <daigo at debian.org>
Date:   Sun Jun 5 23:21:00 2011 +0900

    * New upstream release.
    * debian/rules: Clean auto-generated files (Closes: #628264)

diff --git a/debian/changelog b/debian/changelog
index 89b60f0..4aaba8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,22 +1,20 @@
-libgsl-ruby (1.14.3-2) unstable; urgency=low
+libgsl-ruby (1.14.7-1) unstable; urgency=low
 
+  * New upstream release.
   * 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.
     - Build-Depends libtamuanova-dev to build a related module.
-  * Restore completely: (Closes: #628264) 
-    - debian/patches/003_config: Added a patch
-    - debian/rb_gsl_config.h: Copied from the upstream source
-      to restore.
+  * debian/rules: Clean auto-generated files (Closes: #628264) 
   * Added patches to work around build failure:
     - debian/patches/20110605_matrix_complex.c
     - debian/patches/20110605_vector_complex.c
   * 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
+ -- Daigo Moriwaki <daigo at debian.org>  Sun, 05 Jun 2011 22:53:59 +0900
 
 libgsl-ruby (1.14.3-1) unstable; urgency=low
 
diff --git a/debian/patches/003_config b/debian/patches/003_config
deleted file mode 100644
index cdda83e..0000000
--- a/debian/patches/003_config
+++ /dev/null
@@ -1,16 +0,0 @@
-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')
diff --git a/debian/patches/series b/debian/patches/series
index 68fd99e..df6ceb1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@
 20110605_vector_complex.c
 20110605_matrix_complex.c
 20110605_extconf.rb
-003_config
diff --git a/debian/rules b/debian/rules
index a32115d..286ac87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,9 @@ DEB_INSTALL_DOCS_libgsl-ruby-doc += $(DEB_SRCDIR)/examples
 DEB_INSTALL_DOCS_libgsl-ruby-doc += $(DEB_SRCDIR)/html
 DEB_INSTALL_DOCS_libgsl-ruby-doc += $(DEB_SRCDIR)/tests
 
+build/libgsl-ruby-doc::
+	rdoc -o html rdoc/*
+
 # cleanup
 binary-install/libgsl-ruby-doc::
 	rm -rf debian/libgsl-ruby-doc/usr/share/doc/libgsl-ruby-doc/html/.xvpics
@@ -25,8 +28,8 @@ binary-install/libgsl-ruby-doc::
 	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
+	if [ -d html ] ; then rm -rf html; fi
+	for f in include/rb_gsl_config.h lib/gsl.rb lib/rbgsl.rb; do \
+	  rm -rf $$f; \
+	done
 

-- 
ruby-gsl.git