[Pkg-scicomp-commits] sundials/trunk/debian

Daniel Leidert daniel.leidert.spam at gmx.net
Mon May 12 01:43:12 UTC 2008


SVN commit 2477 by dleidert-guest:

* debian/control (Depends): Added gfortran to build FORTRAN examples.
* debian/libsundials-cvode0.install: Removed DEB_DESTDIR from path.
* debian/libsundials-cvodes1.install: Ditto.
* debian/libsundials-ida1.install: Ditto.
* debian/libsundials-kinsol0.install: Ditto.
* debian/libsundials-nvecserial0.install: Ditto.
* debian/libsundials-serial-dev.install: Ditto. Further removed manpage
  installation (done with dh_installman).
* debian/rules: Set gfortran as FORTRAN compiler. Install everything from
  DEB_DESTDIR.
  (DEB_CONFIGURE_EXTRA_FLAGS): Removed --enable-fortran, which is not a
  valid option. Added option to make examples install.
  (install/libsundials-serial-dev): Removed target. Better done with
  DEB_INSTALL_MANPAGES.

TODO: Examples are built now (someone requested it with --enable-examples),
but not installed to any package. Note: Installation location can be changed
in DEB_CONFIGURE_EXTRA_FLAGS (choose a directory in debian/tmp or a
package directory).

 M  +14 -1     sundials/trunk/debian/changelog  
 M  +1 -1      sundials/trunk/debian/control  
 M  +1 -1      sundials/trunk/debian/libsundials-cvode0.install  
 M  +1 -1      sundials/trunk/debian/libsundials-cvodes1.install  
 M  +1 -1      sundials/trunk/debian/libsundials-ida1.install  
 M  +1 -1      sundials/trunk/debian/libsundials-kinsol0.install  
 M  +1 -1      sundials/trunk/debian/libsundials-nvecserial0.install  
 M  +4 -7      sundials/trunk/debian/libsundials-serial-dev.install  
 M  +6 -5      sundials/trunk/debian/rules  


--- sundials/trunk/debian/changelog #2476:2477
@@ -16,9 +16,22 @@
   * debian/sundials-config.1: Drop .NH macro
 
   [ Daniel Leidert ]
+  * debian/control (Depends): Added gfortran to build FORTRAN examples.
+  * debian/libsundials-cvode0.install: Removed DEB_DESTDIR from path.
+  * debian/libsundials-cvodes1.install: Ditto.
+  * debian/libsundials-ida1.install: Ditto.
+  * debian/libsundials-kinsol0.install: Ditto.
+  * debian/libsundials-nvecserial0.install: Ditto.
+  * debian/libsundials-serial-dev.install: Ditto. Further removed manpage
+    installation (done with dh_installman).
   * debian/sundials-config.1: Minor format changes.
   * debian/rules: Added get-orig-source target to retieve source code via
-    wget, which works atm.
+    wget, which works atm. Set gfortran as FORTRAN compiler. Install
+    everything from DEB_DESTDIR.
+    (DEB_CONFIGURE_EXTRA_FLAGS): Removed --enable-fortran, which is not a
+    valid option. Added option to make examples install.
+    (install/libsundials-serial-dev): Removed target. Better done with
+    DEB_INSTALL_MANPAGES.
 
  -- Rafael Laboissiere <rafael at debian.org>  Tue, 18 Mar 2008 15:25:10 +0100
 
--- sundials/trunk/debian/control #2476:2477
@@ -3,7 +3,7 @@
 Section: libs
 Maintainer: Debian Scientific Computing Team <pkg-scicomp-devel at lists.alioth.debian.org>
 Uploaders: Rafael Laboissiere <rafael at debian.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, cdbs, quilt
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, cdbs, quilt, gfortran
 Standards-Version: 3.7.3
 Homepage: http://www.llnl.gov/CASC/sundials/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-scicomp/sundials/trunk/
--- sundials/trunk/debian/libsundials-cvode0.install #2476:2477
@@ -1 +1 @@
-debian/tmp/usr/lib/libsundials_cvode.so.*
+usr/lib/libsundials_cvode.so.*
--- sundials/trunk/debian/libsundials-cvodes1.install #2476:2477
@@ -1 +1 @@
-debian/tmp/usr/lib/libsundials_cvodes.so.*
+usr/lib/libsundials_cvodes.so.*
--- sundials/trunk/debian/libsundials-ida1.install #2476:2477
@@ -1 +1 @@
-debian/tmp/usr/lib/libsundials_ida.so.*
+usr/lib/libsundials_ida.so.*
--- sundials/trunk/debian/libsundials-kinsol0.install #2476:2477
@@ -1 +1 @@
-debian/tmp/usr/lib/libsundials_kinsol.so.*
+usr/lib/libsundials_kinsol.so.*
--- sundials/trunk/debian/libsundials-nvecserial0.install #2476:2477
@@ -1 +1 @@
-debian/tmp/usr/lib/libsundials_nvecserial.so.*
+usr/lib/libsundials_nvecserial.so.*
--- sundials/trunk/debian/libsundials-serial-dev.install #2476:2477
@@ -1,7 +1,4 @@
-debian/tmp/usr/include
-debian/tmp/usr/lib/lib*a
-debian/tmp/usr/lib/lib*.so
-debian/tmp/usr/bin/sundials-config
-debian/tmp/usr/share/man/man1/sundials-config.1
-
-
+usr/include
+usr/lib/lib*a
+usr/lib/lib*.so
+usr/bin/sundials-config
--- sundials/trunk/debian/rules #2476:2477
@@ -7,9 +7,14 @@
 
 debusr := $(DEB_DESTDIR)usr
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-shared --enable-fortran --disable-mpi --enable-examples
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-shared --disable-mpi --enable-examples
+DEB_CONFIGURE_EXTRA_FLAGS += --with-examples-instdir=$(debusr)
+DEB_CONFIGURE_SCRIPT_ENV += F77="gfortran"
 DEB_MAKE_INSTALL_TARGET := install prefix=$(debusr)
 
+DEB_INSTALL_MANPAGES_libsundials-serial-dev := debian/sundials-config.1
+DEB_DH_INSTALL_SOURCEDIR = $(DEB_DESTDIR)
+
 # The following hack is necessary because the upstream makefiles do
 # not install $libdir and $includedir or $mandir
 common-install-prehook-impl::
@@ -17,10 +22,6 @@
 	mkdir -p $(debusr)/include
 	mkdir -p $(debusr)/share/man/man1
 
-# install the manpage for sundials-config (missing upstream)
-install/libsundials-serial-dev::
-	cp debian/sundials-config.1 $(debusr)/share/man/man1
-
 get-orig-source:
 	wget -O $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
 	     https://computation.llnl.gov/casc/sundials/download/code/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.gz



More information about the Pkg-scicomp-commits mailing list