r45224 - /packages/sundials/trunk/debian/
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Tue Jul 10 08:07:25 UTC 2012
Author: trophime-guest
Date: Tue Jul 10 08:07:23 2012
New Revision: 45224
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45224
Log:
fix dbg packages
Added:
packages/sundials/trunk/debian/libsundials-nvecparallel-dev.install
packages/sundials/trunk/debian/libsundials-parallel.lintian-overrides
Removed:
packages/sundials/trunk/debian/libsundials-cvode0.install
packages/sundials/trunk/debian/libsundials-cvodes1.install
packages/sundials/trunk/debian/libsundials-ida1.install
packages/sundials/trunk/debian/libsundials-kinsol0.install
Modified:
packages/sundials/trunk/debian/check.sh
packages/sundials/trunk/debian/control
packages/sundials/trunk/debian/libsundials-serial-dev.install
packages/sundials/trunk/debian/rules
Modified: packages/sundials/trunk/debian/check.sh
URL: http://svn.debian.org/wsvn/debian-science/packages/sundials/trunk/debian/check.sh?rev=45224&op=diff
==============================================================================
--- packages/sundials/trunk/debian/check.sh (original)
+++ packages/sundials/trunk/debian/check.sh Tue Jul 10 08:07:23 2012
@@ -14,24 +14,32 @@
cd $1/examples
for dir in $(find . -type d -maxdepth 1 -mindepth 1) ; do
- cd $dir/serial
- echo "tests in " $dir
- for prog in $(find . -executable -type f) ; do
- echo -n "Checking $prog... "
- ./$prog > $RESULTS
- if test -e $2/examples/$dir/serial/$prog.out ; then
- DIFF=$(diff -u $2/examples/$dir/serial/$prog.out $RESULTS)
- if test -z "$DIFF" ; then
- echo success
+ #for mode in "serial" "fcmix_serial" "parallel" "fcmix_parallel" ; do
+ for mode in "serial" ; do
+ cd $dir/$mode
+ echo "tests in " $mode
+ for prog in $(find . -executable -type f) ; do
+ echo -n "Checking $prog... "
+ if [ "$mode" != "parallel" ]; then
+ ./$prog > $RESULTS
+ else
+ OMPI_MCA_plm_rsh_agent=/bin/false ./$prog > $RESULTS
+ fi
+
+ if test -e $2/examples/$dir/serial/$prog.out ; then
+ DIFF=$(diff -u $2/examples/$dir/serial/$prog.out $RESULTS)
+ if test -z "$DIFF" ; then
+ echo success
+ else
+ echo fail
+ echo "$DIFF"
+ fi
else
- echo fail
- echo "$DIFF"
+ echo pass
fi
- else
- echo pass
- fi
+ done
+ cd $1/examples
done
- cd $1/examples
done
cd $CWD
Modified: packages/sundials/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/sundials/trunk/debian/control?rev=45224&op=diff
==============================================================================
--- packages/sundials/trunk/debian/control (original)
+++ packages/sundials/trunk/debian/control Tue Jul 10 08:07:23 2012
@@ -31,9 +31,8 @@
Package: libsundials-parallel
Architecture: any
Depends: libsundials-cvode1, libsundials-cvodes2, libsundials-ida2,
- libsundials-idas0, libsundials-kinsol1, ${misc:Depends}, mpi-default-run
-Conflicts: libsundials-par0
-Replaces: libsundials-par0
+ libsundials-idas0, libsundials-kinsol1, libsundials-nvecparallel0,
+ ${misc:Depends}, mpi-default-run
Description: SUite of Nonlinear and DIfferential/ALgebraic equation Solvers
The family of solvers referred to as SUNDIALS consists of solvers CVODE
(for ODE systems), CVODES (ODE with sensitivity analysis capabilities),
@@ -42,9 +41,7 @@
.
This package depends on all other packages containing the shared
libraries for the subcomponents of SUNDIALS: CVODE, CVODES, IDA,
- KINSOL, and NVECTOR_PAR.
- .
- This package provides MPI version
+ KINSOL, and NVECTOR_PARALLEL.
Package: libsundials-cvode1
Architecture: any
@@ -121,16 +118,15 @@
SUNDIALS in C and, in case of FCVODE and FKINSOL, Fortran. It also
contains various example programs distributed by the upstream authors.
-Package: libsundials-parallel-dev
+Package: libsundials-nvecparallel-dev
Section: libdevel
Architecture: any
-Depends: libsundials-parallel (= ${binary:Version}), libsundials-nvecparallel0 (= ${binary:Version}), ${misc:Depends}
-Description: SUNDIALS development files
- The family of solvers referred to as SUNDIALS (SUite of Nonlinear and
- DIfferential/ALgebraic equation Solvers) consists of solvers CVODE
- (for ODE systems), CVODES (ODE with sensitivity analysis capabilities),
- IDA (for differential-algebraic systems), and KINSOL (for nonlinear
- algebraic systems).
+Depends: libsundials-nvecparallel0 (= ${binary:Version}), ${misc:Depends}
+Description: MPI vector operations library (SUNDIALS library)
+ This package provides implementations for all vector operations
+ defined by the generic NVECTOR module in the table of operations for
+ SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation
+ Solvers).
.
This package contains files necessary for development applications using
SUNDIALS in C and, in case of FCVODE and FKINSOL, Fortran. It also
@@ -178,15 +174,19 @@
.
This package contains the debugging symbols for SUNDIALS.
-Package: libsundials-parallel-dbg
+Package: libsundials-nvecparallel-dbg
Section: debug
Architecture: any
Priority: extra
-Depends: libsundials-parallel, ${misc:Depends}
-Description: SUite of Nonlinear and DIfferential/ALgebraic equation Solvers
- The family of solvers referred to as SUNDIALS consists of solvers CVODE
- (for ODE systems), CVODES (ODE with sensitivity analysis capabilities),
- IDA (for differential-algebraic systems), and KINSOL (for nonlinear
- algebraic systems).
+Depends: libsundials-nvecparallel0 (= ${binary:Version}), ${misc:Depends}
+Description: MPI vector operations library (SUNDIALS library)
+ This package provides implementations for all vector operations
+ defined by the generic NVECTOR module in the table of operations for
+ SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation
+ Solvers).
.
- This package contains the debugging symbols for SUNDIALS.
+ This package contains files necessary for development applications using
+ SUNDIALS in C and, in case of FCVODE and FKINSOL, Fortran. It also
+ contains various example programs distributed by the upstream authors.
+ .
+ This package contains the debugging symbols.
Added: packages/sundials/trunk/debian/libsundials-nvecparallel-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/sundials/trunk/debian/libsundials-nvecparallel-dev.install?rev=45224&op=file
==============================================================================
--- packages/sundials/trunk/debian/libsundials-nvecparallel-dev.install (added)
+++ packages/sundials/trunk/debian/libsundials-nvecparallel-dev.install Tue Jul 10 08:07:23 2012
@@ -1,0 +1,4 @@
+usr/lib/libsundials_nvecparallel.a
+usr/lib/libsundials_fnvecparallel.a
+usr/lib/libsundials_nvecparallel.so
+usr/lib/libsundials_fnvecparallel.so
Added: packages/sundials/trunk/debian/libsundials-parallel.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/sundials/trunk/debian/libsundials-parallel.lintian-overrides?rev=45224&op=file
==============================================================================
--- packages/sundials/trunk/debian/libsundials-parallel.lintian-overrides (added)
+++ packages/sundials/trunk/debian/libsundials-parallel.lintian-overrides Tue Jul 10 08:07:23 2012
@@ -1,0 +1,2 @@
+# This package will install all serial libraries
+libsundials-parallel: empty-binary-package
Modified: packages/sundials/trunk/debian/libsundials-serial-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/sundials/trunk/debian/libsundials-serial-dev.install?rev=45224&op=diff
==============================================================================
--- packages/sundials/trunk/debian/libsundials-serial-dev.install (original)
+++ packages/sundials/trunk/debian/libsundials-serial-dev.install Tue Jul 10 08:07:23 2012
@@ -1,6 +1,13 @@
-usr/include
-usr/lib/lib*a
-usr/lib/lib*.so
-bin/sundials-config usr/bin/sundials-config
+usr/lib/libsundials_cvode*.a
+usr/lib/libsundials_cvode*.so
+usr/lib/libsundials_ida*.a
+usr/lib/libsundials_ida*.so
+usr/lib/libsundials_kinsol.a
+usr/lib/libsundials_*serial.a
+usr/lib/libsundials_*serial.so
+
+usr/lib/libsundials_kinsol.so
+
+bin/sundials-config usr/bin
debian/sundials-config.1 usr/share/man/man1
Modified: packages/sundials/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/sundials/trunk/debian/rules?rev=45224&op=diff
==============================================================================
--- packages/sundials/trunk/debian/rules (original)
+++ packages/sundials/trunk/debian/rules Tue Jul 10 08:07:23 2012
@@ -9,8 +9,8 @@
LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-debusr := $(DEB_DESTDIR)usr
-debexp = debian/libsundials-serial-dev/usr/share/doc/libsundials-serial-dev/examples
+#workaround to start MPI-applications in chroot
+export OMPI_MCA_plm_rsh_agent=/bin/false
extra_flags += \
-DCMAKE_Fortran_COMPILER=gfortran \
@@ -51,20 +51,21 @@
dh_auto_install
#
#install/octave-sundials::
- mkdir -p debian/tmp/$(mpath)
mkdir -p debian/tmp/$(bpath)/sundialsTB/cvodes/cvm/
mv sundialsTB/octave/sundialsTB/cvodes/cvm/cvm.mex debian/tmp/$(bpath)/sundialsTB/cvodes/cvm
mkdir -p debian/tmp/$(bpath)/sundialsTB/idas/idm/
mv sundialsTB/octave/sundialsTB/idas/idm/idm.mex debian/tmp/$(bpath)/sundialsTB/idas/idm
mkdir -p debian/tmp/$(bpath)/sundialsTB/kinsol/kim
mv sundialsTB/octave/sundialsTB/kinsol/kim/kim.mex debian/tmp/$(bpath)/sundialsTB/kinsol/kim
+
+ mkdir -p debian/tmp/$(mpath)
mv sundialsTB/octave/* debian/tmp/$(mpath)
rm debian/tmp/$(mpath)/sundialsTB/LICENSE
#
#install sundials-config
cp bin/sundials-config.in bin/sundials-config
perl -pi -e "s|\@SHELL\@|/bin/bash|" bin/sundials-config
-
+
dh_install -a -Nlibsundials-doc
dh_install -plibsundials-doc -X.txt -X.out -X.in -XREADME
@@ -75,9 +76,17 @@
override_dh_strip:
find debian/tmp/$(bpath) -name \*.mex | xargs -r strip
- dh_strip -a -Nlibsundials-serial -Nlibsundials-parallel
- dh_strip -plibsundials-serial --dbg-package=libsundials-serial-dbg
- dh_strip -plibsundials-parallel --dbg-package=libsundials-parallel-dbg
+ dh_strip -plibsundials-cvode1 --dbg-package=libsundials-serial-dbg
+ dh_strip -plibsundials-cvodes2 --dbg-package=libsundials-serial-dbg
+ dh_strip -plibsundials-ida2 --dbg-package=libsundials-serial-dbg
+ dh_strip -plibsundials-idas0 --dbg-package=libsundials-serial-dbg
+ dh_strip -plibsundials-kinsol1 --dbg-package=libsundials-serial-dbg
+ dh_strip -plibsundials-nvecserial0 --dbg-package=libsundials-serial-dbg
+
+ dh_strip -plibsundials-nvecparallel0 --dbg-package=libsundials-nvecparallel-dbg
+ dh_strip -a
+
+ ls -l debian/tmp/usr/lib
override_dh_auto_clean:
find examples \
More information about the debian-science-commits
mailing list