[DRE-commits] [SCM] ruby-gsl.git branch, master, updated. 5df5458286439a144dcfbc6ffac265e421b6b2b7

Daigo Moriwaki daigo at debian.org
Tue Dec 13 12:39:20 UTC 2011


The following commit has been merged in the master branch:
commit 496b3cffb321a482eae936ee797aa0523f06818d
Author: Daigo Moriwaki <daigo at debian.org>
Date:   Mon Dec 12 22:17:16 2011 +0900

    Converted the build system to gem2deb, removed build dependency on cdbs and ruby-pkg-tools

diff --git a/debian/changelog b/debian/changelog
index 4aaba8b..aadf0f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libgsl-ruby (1.14.7-1) unstable; urgency=low
+ruby-gsl (1.14.7-1) unstable; urgency=low
 
   * New upstream release.
   * debian/control:
@@ -13,6 +13,8 @@ libgsl-ruby (1.14.7-1) unstable; urgency=low
     - debian/patches/20110605_vector_complex.c
   * debian/patches/20110605_extconf.rb: Added a patch to find narra.h
     correctly.
+  * Converted the build system to gem2deb, removed build dependency on cdbs
+    and ruby-pkg-tools
 
  -- Daigo Moriwaki <daigo at debian.org>  Sun, 05 Jun 2011 22:53:59 +0900
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 1d937ed..649f4e0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,28 +1,32 @@
-Source: libgsl-ruby
+Source: ruby-gsl
 Section: ruby
 Priority: optional
 Maintainer: Daigo Moriwaki <daigo at debian.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Deepak Tripathi <apenguinlinux at gmail.com>
-Build-Depends: debhelper (>= 7.0.0), ruby1.9.1, ruby1.9.1-dev, ruby1.8, ruby1.8-dev, rdoc, graphviz, cdbs, quilt, ruby-pkg-tools (>= 0.17), libgsl0-dev (>= 1.14), plotutils, ruby-narray, libtamuanova-dev
+Build-Depends: debhelper (>= 7.0.50~), quilt, gem2deb (>= 0.2.2), libgsl0-dev (>= 1.14), plotutils, ruby-narray, libtamuanova-dev
 Vcs-Git: git://git.debian.org/git/pkg-ruby-extras/ruby-gsl.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-gsl.git;a=summary
 Standards-Version: 3.9.2
 Homepage: http://rb-gsl.rubyforge.org/
+XS-Ruby-Versions: all
 
-Package: libgsl-ruby1.8
+Package: ruby-gsl
 Architecture: any
-Depends: ruby1.8, plotutils, ruby-narray, ${shlibs:Depends}, ${misc:Depends}
-Suggests: libgsl-ruby-doc
+XB-Ruby-Versions: ${ruby:Versions}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter, plotutils, ruby-narray
+Replaces: libgsl-ruby (<< 1.14.7-1), libgsl-ruby1.8 (<< 1.14.7-1), libgsl-ruby1.9.1 (<< 1.14.7-1)
+Conflicts: libgsl-ruby (<< 1.14.7-1), libgsl-ruby1.8 (<< 1.14.7-1), libgsl-ruby1.9.1 (<< 1.14.7-1)
+Provides: libgsl-ruby, libgsl-ruby1.8, libgsl-ruby1.9.1
 Description: Ruby bindings for the GNU Scientific Library (GSL)
  The GNU Scientific Library (GSL) is a collection of data types and
  routines for numerical computing. Ruby/GSL is an interface to the GNU
  Scientific Library for the Ruby programming language.
 
-Package: libgsl-ruby1.8-dbg
+Package: ruby-gsl-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libgsl-ruby1.8 (= ${binary:Version}), ${misc:Depends}
+Depends: ruby-gsl (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: Ruby bindings for the GNU Scientific Library (GSL)
  The GNU Scientific Library (GSL) is a collection of data types and
  routines for numerical computing. Ruby/GSL is an interface to the GNU
@@ -32,55 +36,56 @@ Description: Ruby bindings for the GNU Scientific Library (GSL)
  in a debugger, this makes it somewhat easier to interpret core
  dumps.  Most people will not need this package.
 
+Package: libgsl-ruby1.8
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends:  ruby-gsl, ${misc:Depends}
+Description: Transitional package for ruby-gsl
+ This is a transitional package to ease upgrades to the ruby-gsl
+ package. It can safely be removed.
+
+Package: libgsl-ruby1.8-dbg
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends:  ruby-gsl-dbg, ${misc:Depends}
+Description: Transitional package for ruby-gsl-dbg
+ This is a transitional package to ease upgrades to the ruby-gsl-dbg
+ package. It can safely be removed.
+
 Package: libgsl-ruby
+Section: oldlibs
+Priority: extra
 Architecture: all
-Depends: libgsl-ruby1.8 (>= ${source:Version}), ${misc:Depends}
-Suggests: libgsl-ruby-doc
-Description: Ruby bindings for the GNU Scientific Library (GSL) (dummy package)
- The GNU Scientific Library (GSL) is a collection of data types and
- routines for numerical computing. Ruby/GSL is an interface to the GNU
- Scientific Library for the Ruby programming language.
- .
- This package is a dependency package, which depends on Debian's default Ruby
- version (currently 1.8.x).
+Depends:  ruby-gsl, ${misc:Depends}
+Description: Transitional package for ruby-gsl
+ This is a transitional package to ease upgrades to the ruby-gsl
+ package. It can safely be removed.
 
 Package: libgsl-ruby-doc
-Section: doc
-Depends: libgsl-ruby (>= ${source:Version}), ${misc:Depends}
+Section: oldlibs
+Priority: extra
 Architecture: all
-Description: Documentation for Ruby/GSL (libgsl-ruby)
- This package provides documentation, example scripts and unit tests for
- Ruby/GSL.
- .
- Ruby/GSL is an interface to the GNU Scientific Library for the Ruby
- programming language.
- . 
- This is for ruby 1.8
+Depends:  ruby-gsl, ${misc:Depends}
+Description: Transitional package for ruby-gsl
+ This is a transitional package to ease upgrades to the ruby-gsl
+ package. It can safely be removed.
 
 Package: libgsl-ruby1.9.1
-Architecture: any
-Depends: ruby1.9.1, plotutils, ${shlibs:Depends}, ${misc:Depends}
-Suggests: libgsl-ruby-doc
-Description: Ruby bindings for the GNU Scientific Library (GSL)
- The GNU Scientific Library (GSL) is a collection of data types and
- routines for numerical computing. Ruby/GSL is an interface to the GNU
- Scientific Library for the Ruby programming language.
- . 
- This is for ruby 1.9.1
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends:  ruby-gsl, ${misc:Depends}
+Description: Transitional package for ruby-gsl
+ This is a transitional package to ease upgrades to the ruby-gsl
+ package. It can safely be removed.
 
 Package: libgsl-ruby1.9.1-dbg
-Section: debug
+Section: oldlibs
 Priority: extra
-Architecture: any
-Depends: libgsl-ruby1.9.1 (= ${binary:Version}), ${misc:Depends}
-Description: Ruby bindings for the GNU Scientific Library (GSL)
- The GNU Scientific Library (GSL) is a collection of data types and
- routines for numerical computing. Ruby/GSL is an interface to the GNU
- Scientific Library for the Ruby programming language.
- . 
- This is for ruby 1.9.1
- .
- This package is provided primarily to provide a backtrace with names
- in a debugger, this makes it somewhat easier to interpret core
- dumps.  Most people will not need this package.
-
+Architecture: all
+Depends:  ruby-gsl-dbg, ${misc:Depends}
+Description: Transitional package for ruby-gsl-dbg
+ This is a transitional package to ease upgrades to the ruby-gsl-dbg
+ package. It can safely be removed.
diff --git a/debian/rules b/debian/rules
index 286ac87..57777ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,35 +1,24 @@
 #!/usr/bin/make -f
 
-ruby_ver1.8 = 1.8
-ruby_ver1.9.1 = 1.9.1
+%:
+	dh $@ --buildsystem ruby --with ruby --with quilt
 
-DEB_DBG_PACKAGE_libgsl-ruby$(ruby_ver1.8) = libgsl-ruby$(ruby_ver1.8)-dbg
-DEB_DBG_PACKAGE_libgsl-ruby$(ruby_ver1.9.1) = libgsl-ruby$(ruby_ver1.9.1)-dbg
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-DEB_RUBY_CONFIG_ARGS += --siterubyverarch=$(DEB_RUBY_ARCHDIR)
-
-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
-	rm -rf debian/libgsl-ruby-doc/usr/share/doc/libgsl-ruby-doc/examples/fit/*.dat
-	rm -rf debian/libgsl-ruby-doc/usr/share/doc/libgsl-ruby-doc/examples/linalg/linalg.replaced
-	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::
+override_dh_auto_clean:
+	dh_auto_clean
 	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
 
+override_dh_strip:
+	dh_strip --dbg-package=ruby-gsl-dbg
+
+override_dh_installdocs:
+	rdoc -o html rdoc/*
+	dh_installdocs html examples
+	rm -rf debian/ruby-gsl/usr/share/doc/ruby-gsl/html/.xvpics
+	rm -rf debian/ruby-gsl/usr/share/doc/ruby-gsl/examples/fit/*.dat
+	rm -rf debian/ruby-gsl/usr/share/doc/ruby-gsl/examples/linalg/linalg.replaced
+	rm -rf debian/ruby-gsl/usr/share/doc/ruby-gsl/examples/gallery/rgplot/rgplot.replaced
+	find debian/ruby-gsl/usr/share/doc/ruby-gsl/examples -name "*.rb" -exec chmod a-x {} \;
+

-- 
ruby-gsl.git



More information about the Pkg-ruby-extras-commits mailing list