[scalapack] 13/29: Import Debian changes 1.8.0-3.1
Muammar El Khatib
muammar at moszumanska.debian.org
Sun Jun 11 16:16:29 UTC 2017
This is an automated email from the git hooks/post-receive script.
muammar pushed a commit to branch master
in repository scalapack.
commit 92302284416e225ed15069b92317945f0a4cb973
Author: Muammar El Khatib <Adam>
Date: Mon May 4 21:59:43 2009 -0400
Import Debian changes 1.8.0-3.1
scalapack (1.8.0-3.1) unstable; urgency=low
* NMU as authorized by maintainer.
* Changed to build against mpi-default-dev. (Closes: #491028)
* Replaced two sets of shlib, -dev and -test packages with just one.
* Changed binary package names to generic mpi and to comply with policy
i.e. libscalapack-mpi1 and libblacs-mpi-dev.
* Added sections to all packages.
---
debian/changelog | 11 ++
debian/control | 94 ++++----------
...pack-lam-dev.dirs => libscalapack-mpi-dev.dirs} | 0
...apack-mpich-dev.dirs => libscalapack-mpi1.dirs} | 0
...pack-pvm-dev.dirs => libscalapack-pvm-dev.dirs} | 0
...{scalapack1-lam.dirs => libscalapack-pvm1.dirs} | 0
debian/rules | 138 +++++++++++++++++----
debian/scalapack-lam-dev.links | 1 -
...apack-lam-test.dirs => scalapack-mpi-test.dirs} | 0
debian/scalapack-mpich-dev.links | 1 -
debian/scalapack-mpich-test.dirs | 1 -
debian/scalapack-openmpi.patch | 45 +++++++
debian/scalapack-pvm-dev.links | 1 -
debian/scalapack1-lam.links | 1 -
debian/scalapack1-lam.postinst | 9 --
debian/scalapack1-mpich.dirs | 1 -
debian/scalapack1-mpich.links | 1 -
debian/scalapack1-mpich.postinst | 9 --
debian/scalapack1-pvm.dirs | 1 -
debian/scalapack1-pvm.links | 1 -
debian/scalapack1-pvm.postinst | 9 --
21 files changed, 196 insertions(+), 128 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ed51989..f4cba4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+scalapack (1.8.0-3.1) unstable; urgency=low
+
+ * NMU as authorized by maintainer.
+ * Changed to build against mpi-default-dev. (Closes: #491028)
+ * Replaced two sets of shlib, -dev and -test packages with just one.
+ * Changed binary package names to generic mpi and to comply with policy
+ i.e. libscalapack-mpi1 and libblacs-mpi-dev.
+ * Added sections to all packages.
+
+ -- Adam C. Powell, IV <hazelsct at debian.org> Mon, 04 May 2009 21:59:43 -0400
+
scalapack (1.8.0-3) unstable; urgency=low
* Bumped standards version to 3.8.0.
diff --git a/debian/control b/debian/control
index fcaea7c..69729c9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,30 +2,33 @@ Source: scalapack
Section: devel
Priority: extra
Maintainer: Muammar El Khatib <muammarelkhatib at gmail.com>
-Standards-Version: 3.8.0
-Build-Depends: libmpich1.0-dev, lam4-dev (>= 7.1.1-3.2), pvm-dev, blacs-pvm-dev, gfortran, liblapack-dev | liblapack.so.3gf , libblas-dev | libblas.so.3gf, debhelper (>= 6), blacsgf-mpich-dev, blacsgf-lam-dev
+Standards-Version: 3.8.1
+Build-Depends: mpi-default-dev, pvm-dev, blacs-pvm-dev, gfortran, liblapack-dev | liblapack.so.3gf , libblas-dev | libblas.so.3gf, debhelper (>= 6), libblacs-mpi-dev
Homepage: http://www.netlib.org/scalapack/
-Package: scalapack1-mpich
+Package: libscalapack-mpi1
+Section: libs
Architecture: any
-Depends: mpich-bin (>= 1.2.7-1), ${shlibs:Depends}
+Depends: mpi-default-bin, ${shlibs:Depends}
+Conflicts: scalapack1-mpich, scalapack1-lam
+Replaces: scalapack1-mpich, scalapack1-lam
Suggests: scalapack-doc
-Description: Scalable Linear Algebra Package - Shared libs. for MPICH
+Description: Scalable Linear Algebra Package - Shared libs. for MPI
ScaLAPACK is the parallel version of LAPACK and is used on Beowulf type
clusters.
.
You can choose between an implementation based on MPI or PVM. This
- package uses MPI.
- .
- The package is available for LAM and MPICH. This package uses MPICH. There
- are packages for the shared libraries (this one), for the static
- libraries and the development files and for test programs.
+ package uses MPI. There are packages for the shared libraries (this one), for
+ the static libraries and the development files and for test programs.
.
Also included: PBLAS, Parallel Basic Linear Algebra Subprograms.
-Package: scalapack-mpich-dev
+Package: libscalapack-mpi-dev
+Section: libdevel
Architecture: any
-Depends: scalapack1-mpich (= ${binary:Version}), blacsgf-mpich-dev, ${shlibs:Depends}
+Depends: libscalapack-mpi1 (= ${binary:Version}), libblacs-mpi-dev
+Conflicts: scalapack-mpich-dev, scalapack-lam-dev
+Replaces: scalapack-mpich-dev, scalapack-lam-dev
Suggests: scalapack-doc
Description: Scalable Linear Algebra Package - Dev. files for MPICH
ScaLAPACK is the parallel version of LAPACK and is used on Beowulf type
@@ -40,9 +43,12 @@ Description: Scalable Linear Algebra Package - Dev. files for MPICH
.
Also included: PBLAS, Parallel Basic Linear Algebra Subprograms.
-Package: scalapack-mpich-test
+Package: scalapack-mpi-test
+Section: math
Architecture: any
Depends: scalapack-test-common, ${shlibs:Depends}
+Conflicts: scalapack-mpich-test, scalapack-lam-test
+Replaces: scalapack-mpich-test, scalapack-lam-test
Suggests: scalapack-doc
Description: Scalable Linear Algebra Package - Test files for MPICH
ScaLAPACK is the parallel version of LAPACK and is used on Beowulf type
@@ -57,61 +63,13 @@ Description: Scalable Linear Algebra Package - Test files for MPICH
.
Also included: PBLAS, Parallel Basic Linear Algebra Subprograms.
-Package: scalapack1-lam
-Architecture: any
-Depends: ${shlibs:Depends}
-Suggests: scalapack-doc
-Description: Scalable Linear Algebra Package - Shared libs. for LAM
- ScaLAPACK is the parallel version of LAPACK and is used on Beowulf type
- clusters.
- .
- You can choose between an implementation based on MPI or PVM. This
- package uses MPI.
- .
- The package is available for LAM and MPICH. This package uses LAM. There
- are packages for the shared libraries (this one), for the static
- libraries and the development files and for test programs.
- .
- Also included: PBLAS, Parallel Basic Linear Algebra Subprograms.
-
-Package: scalapack-lam-dev
-Architecture: any
-Depends: scalapack1-lam (= ${binary:Version}), lam4-dev, blacsgf-lam-dev (>= 1.1-20), ${shlibs:Depends}
-Suggests: scalapack-doc
-Description: Scalable Linear Algebra Package - Dev. files for LAM
- ScaLAPACK is the parallel version of LAPACK and is used on Beowulf type
- clusters.
- .
- You can choose between an implementation based on MPI or PVM. This
- package uses MPI.
- .
- The package is available for LAM and MPICH. This package uses LAM. There
- are packages for the shared libraries, for the static libraries and
- the development files (this one) and for test programs.
- .
- Also included: PBLAS, Parallel Basic Linear Algebra Subprograms.
-
-Package: scalapack-lam-test
-Architecture: any
-Depends: scalapack-test-common, ${shlibs:Depends}
-Suggests: scalapack-doc
-Description: Scalable Linear Algebra Package - Test files for LAM
- ScaLAPACK is the parallel version of LAPACK and is used on Beowulf type
- clusters.
- .
- You can choose between an implementation based on MPI or PVM. This
- package uses MPI.
- .
- The package is available for LAM and MPICH. This package uses LAM. There
- are packages for the shared libraries, for the static libraries and
- the development files and for test programs (this one).
- .
- Also included: PBLAS, Parallel Basic Linear Algebra Subprograms.
-
-Package: scalapack1-pvm
+Package: libscalapack-pvm1
+Section: libs
Architecture: any
Depends: ${shlibs:Depends}
Suggests: scalapack-doc
+Conflicts: scalapack1-pvm
+Replaces: scalapack1-pvm
Description: Scalable Linear Algebra Package - Shared libs. for PVM
ScaLAPACK is the parallel version of LAPACK and is used on Beowulf type
clusters.
@@ -124,9 +82,10 @@ Description: Scalable Linear Algebra Package - Shared libs. for PVM
.
Also included: PBLAS, Parallel Basic Linear Algebra Subprograms.
-Package: scalapack-pvm-dev
+Package: libscalapack-pvm-dev
+Section: libdevel
Architecture: any
-Depends: scalapack1-pvm (= ${binary:Version}), blacs-pvm-dev, pvm-dev, ${shlibs:Depends}
+Depends: libscalapack-pvm1 (= ${binary:Version}), blacs-pvm-dev, pvm-dev, ${shlibs:Depends}
Suggests: scalapack-doc
Description: Scalable Linear Algebra Package - Dev. files for PVM
ScaLAPACK is the parallel version of LAPACK and is used on Beowulf type
@@ -141,6 +100,7 @@ Description: Scalable Linear Algebra Package - Dev. files for PVM
Also included: PBLAS, Parallel Basic Linear Algebra Subprograms.
Package: scalapack-pvm-test
+Section: math
Architecture: any
Depends: scalapack-test-common, ${shlibs:Depends}
Suggests: scalapack-doc
diff --git a/debian/scalapack-lam-dev.dirs b/debian/libscalapack-mpi-dev.dirs
similarity index 100%
rename from debian/scalapack-lam-dev.dirs
rename to debian/libscalapack-mpi-dev.dirs
diff --git a/debian/scalapack-mpich-dev.dirs b/debian/libscalapack-mpi1.dirs
similarity index 100%
rename from debian/scalapack-mpich-dev.dirs
rename to debian/libscalapack-mpi1.dirs
diff --git a/debian/scalapack-pvm-dev.dirs b/debian/libscalapack-pvm-dev.dirs
similarity index 100%
rename from debian/scalapack-pvm-dev.dirs
rename to debian/libscalapack-pvm-dev.dirs
diff --git a/debian/scalapack1-lam.dirs b/debian/libscalapack-pvm1.dirs
similarity index 100%
rename from debian/scalapack1-lam.dirs
rename to debian/libscalapack-pvm1.dirs
diff --git a/debian/rules b/debian/rules
index 9aa7d18..e1b4bf4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,12 +11,12 @@ version_major:=$(shell echo $(version) | cut -d '.' -f 1)
topdir=$(shell pwd)
-export lamPACKAGES=-pscalapack-lam1 -pscalapack-lam-dev -pscalapack-lam-test
-export mpichPACKAGES=-pscalapack-mpich1 -pscalapack-mpich-dev \
- -pscalapack-mpich-test
-export pvmPACKAGES=-pscalapack-pvm1 -pscalapack-pvm-dev -pscalapack-pvm-test
+# This little hack works on mpich, lam and openmpi as of the lenny release
+SCALAPACK_MPI=$(shell readlink /etc/alternatives/mpi | sed s/usr//g | sed s/include//g | sed s/lib//g | sed s/\\///g)
-build: build-lam build-mpich build-pvm
+build: build-$(SCALAPACK_MPI) build-pvm
+
+build-openmpi: build-stamp-openmpi
build-lam: build-stamp-lam
@@ -24,7 +24,64 @@ build-mpich: build-stamp-mpich
build-pvm: build-stamp-pvm
-build-stamp-lam:
+patch-stamp:
+ patch -p1 < debian/scalapack-openmpi.patch
+ touch $@
+
+unpatch: patch-stamp
+ patch -p1 -R < debian/scalapack-openmpi.patch
+ rm -f patch-stamp
+
+build-stamp-openmpi: patch-stamp
+ dh_testdir
+
+# next is a clean
+ echo *** cleaning object files ***
+ BASEDIR=$(topdir) make clean
+
+# build the shared libraries
+ echo *** building shared libraries for openmpi ***
+ BASEDIR=$(topdir) MPI=openmpi FPIC=-fPIC make lib
+ mkdir -p tmp
+ set -e ;\
+ for i in scalapack ; do \
+ cd tmp ;\
+ ar x ../$${i}_openmpi.a ;\
+ cd .. ;\
+ gcc -shared -Wl,-soname=lib$$i-openmpi.so.$(version_major) -o \
+ lib$$i-openmpi.so.$(version) tmp/*.o -lblas-3gf -llapackgf-3 -lblacsCinit-openmpi -lblacs-openmpi -L/usr/lib/openmpi/lib -lmpi -lmpi_f77 -lgfortran;\
+ ln -snf lib$$i-openmpi.so.$(version) lib$$i-openmpi.so.$(version_major) ;\
+ ln -snf lib$$i-openmpi.so.$(version_major) lib$$i-openmpi.so ;\
+ rm tmp/* ;\
+ done
+ rmdir tmp
+# for i in $$(find -name "*.f"); do \
+# if grep '^[^\*].*TOTMEM *= *' $$i | grep -v 64000000 >/dev/null ; then \
+# cat $$i | sed 's,\(^[^\*].*TOTMEM *= *\)[0-9]*,\164000000,g' >tmp ;\
+# mv tmp $$i;\
+# fi;\
+# done
+
+# the testing binaries
+ echo *** building static testing binaries for openmpi ***
+ BASEDIR=$(topdir) MPI=openmpi BUILD=shared make exe
+ set -e ;\
+ cd TESTING ;\
+ for i in $$(find -name 'x*' -maxdepth 1 ! -name 'x*-lam' ! -name 'x*-mpich' ! -name 'x*-pvm'); do \
+ mv $$i $$i-openmpi ;\
+ done
+
+# next is a clean
+ echo *** cleaning object files ***
+ BASEDIR=$(topdir) make clean
+
+# build the static libraries
+ echo *** building static libraries for openmpi ***
+ BASEDIR=$(topdir) MPI=openmpi make lib
+
+ touch build-stamp-openmpi
+
+build-stamp-lam: patch-stamp
dh_testdir
# next is a clean
@@ -59,7 +116,7 @@ build-stamp-lam:
BASEDIR=$(topdir) MPI=lam BUILD=shared make exe
set -e ;\
cd TESTING ;\
- for i in $$(find -name 'x*' -maxdepth 1); do \
+ for i in $$(find -name 'x*' -maxdepth 1 ! -name 'x*-openmpi' ! -name 'x*-mpich' ! -name 'x*-pvm'); do \
mv $$i $$i-lam ;\
done
@@ -73,7 +130,7 @@ build-stamp-lam:
touch build-stamp-lam
-build-stamp-mpich:
+build-stamp-mpich: patch-stamp
dh_testdir
# next is a clean
@@ -102,7 +159,7 @@ build-stamp-mpich:
BASEDIR=$(topdir) MPI=mpich BUILD=shared make exe
set -e ;\
cd TESTING ;\
- for i in $$(find -name 'x*' -maxdepth 1 ! -name 'x*-lam'); do \
+ for i in $$(find -name 'x*' -maxdepth 1 ! -name 'x*-openmpi' ! -name 'x*-lam' ! -name 'x*-pvm'); do \
mv $$i $$i-mpich ;\
done
@@ -116,7 +173,7 @@ build-stamp-mpich:
touch build-stamp-mpich
-build-stamp-pvm:
+build-stamp-pvm: patch-stamp
dh_testdir
# next is a clean
@@ -145,7 +202,7 @@ build-stamp-pvm:
BASEDIR=$(topdir) MPI=pvm BUILD=shared make exe
set -e ;\
cd TESTING ;\
- for i in $$(find -name 'x*' -maxdepth 1 ! -name 'x*-lam' ! -name 'x*-mpich'); do \
+ for i in $$(find -name 'x*' -maxdepth 1 ! -name 'x*-openmpi' ! -name 'x*-lam' ! -name 'x*-mpich'); do \
mv $$i $$i-pvm ;\
done
@@ -159,7 +216,7 @@ build-stamp-pvm:
touch build-stamp-pvm
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp-* install-stamp-* install-dirs-stamp
@@ -176,7 +233,7 @@ clean:
# done
dh_clean
-install: install-dirs install-mpich install-lam install-pvm
+install: install-dirs install-$(SCALAPACK_MPI) install-pvm
install-dirs: install-dirs-stamp
@@ -188,29 +245,56 @@ install-dirs-stamp:
touch install-dirs-stamp
+install-openmpi: install-stamp-openmpi
+
install-lam: install-stamp-lam
install-mpich: install-stamp-mpich
install-pvm: install-stamp-pvm
+install-stamp-openmpi: build-stamp-openmpi
+ dh_testdir
+ dh_testroot
+
+ set -e ;\
+ for i in scalapack ; do \
+ cp -a lib$$i-openmpi.so.* \
+ `pwd`/debian/libscalapack-mpi1/usr/lib/ ;\
+ cp -a lib$$i-openmpi.so \
+ `pwd`/debian/libscalapack-mpi-dev/usr/lib/ ;\
+ done
+
+ install TESTING/x*-openmpi \
+ `pwd`/debian/scalapack-mpi-test/usr/lib/scalapack
+
+ set -e ;\
+ for i in scalapack ; do \
+ install $${i}_openmpi.a \
+ `pwd`/debian/libscalapack-mpi-dev/usr/lib/lib$$i-openmpi.a ;\
+ done
+
+ touch install-stamp-openmpi
+
install-stamp-lam: build-stamp-lam
dh_testdir
dh_testroot
set -e ;\
for i in scalapack ; do \
- install lib$$i-lam.so.$(version) \
- `pwd`/debian/scalapack1-lam/usr/lib/lib$$i-lam.so.$(version) ;\
+ cp -a lib$$i-lam.so.* \
+ `pwd`/debian/libscalapack-mpi1/usr/lib/ ;\
+ cp -a lib$$i-lam.so \
+ `pwd`/debian/libscalapack-mpi-dev/usr/lib/ ;\
done
install TESTING/x*-lam \
- `pwd`/debian/scalapack-lam-test/usr/lib/scalapack
+ `pwd`/debian/scalapack-mpi-test/usr/lib/scalapack
set -e ;\
for i in scalapack ; do \
install $${i}_lam.a \
- `pwd`/debian/scalapack-lam-dev/usr/lib/lib$$i-lam.a ;\
+ `pwd`/debian/libscalapack-mpi-dev/usr/lib/lib$$i-lam.a ;\
done
touch install-stamp-lam
@@ -221,17 +305,19 @@ install-stamp-mpich: build-stamp-mpich
set -e ;\
for i in scalapack ; do \
- install lib$$i-mpich.so.$(version) \
- `pwd`/debian/scalapack1-mpich/usr/lib/lib$$i-mpich.so.$(version) ;\
+ cp -a lib$$i-mpich.so.* \
+ `pwd`/debian/libscalapack-mpi1/usr/lib/ ;\
+ cp -a lib$$i-mpich.so \
+ `pwd`/debian/libscalapack-mpi-dev/usr/lib/ ;\
done
install TESTING/x*-mpich \
- `pwd`/debian/scalapack-mpich-test/usr/lib/scalapack
+ `pwd`/debian/scalapack-mpi-test/usr/lib/scalapack
set -e ;\
for i in scalapack ; do \
install $${i}_mpich.a \
- `pwd`/debian/scalapack-mpich-dev/usr/lib/lib$$i-mpich.a ;\
+ `pwd`/debian/libscalapack-mpi-dev/usr/lib/lib$$i-mpich.a ;\
done
touch install-stamp-mpich
@@ -242,8 +328,10 @@ install-stamp-pvm: build-stamp-pvm
set -e ;\
for i in scalapack ; do \
- install lib$$i-pvm.so.$(version) \
- `pwd`/debian/scalapack1-pvm/usr/lib/lib$$i-pvm.so.$(version) ;\
+ cp -a lib$$i-pvm.so.* \
+ `pwd`/debian/libscalapack-pvm1/usr/lib/ ;\
+ cp -a lib$$i-pvm.so \
+ `pwd`/debian/libscalapack-pvm-dev/usr/lib/ ;\
done
install TESTING/x*-pvm \
@@ -252,7 +340,7 @@ install-stamp-pvm: build-stamp-pvm
set -e ;\
for i in scalapack ; do \
install $${i}_pvm.a \
- `pwd`/debian/scalapack-pvm-dev/usr/lib/lib$$i-pvm.a ;\
+ `pwd`/debian/libscalapack-pvm-dev/usr/lib/lib$$i-pvm.a ;\
done
touch install-stamp-pvm
@@ -269,7 +357,7 @@ binary-arch: build install
dh_strip
dh_makeshlibs -V
dh_installdeb
- dh_shlibdeps -L scalapack1-pvm -l debian/scalapack1-pvm/usr/lib -L scalapack1-lam -l debian/scalapack1-lam/usr/lib -L scalapack1-mpich -l debian/scalapack1-mpich/usr/lib
+ dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
diff --git a/debian/scalapack-lam-dev.links b/debian/scalapack-lam-dev.links
deleted file mode 100644
index 40d632e..0000000
--- a/debian/scalapack-lam-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libscalapack-lam.so.1 usr/lib/libscalapack-lam.so
diff --git a/debian/scalapack-lam-test.dirs b/debian/scalapack-mpi-test.dirs
similarity index 100%
rename from debian/scalapack-lam-test.dirs
rename to debian/scalapack-mpi-test.dirs
diff --git a/debian/scalapack-mpich-dev.links b/debian/scalapack-mpich-dev.links
deleted file mode 100644
index 2f26854..0000000
--- a/debian/scalapack-mpich-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libscalapack-mpich.so.1 usr/lib/libscalapack-mpich.so
diff --git a/debian/scalapack-mpich-test.dirs b/debian/scalapack-mpich-test.dirs
deleted file mode 100644
index 03f4a42..0000000
--- a/debian/scalapack-mpich-test.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/scalapack
diff --git a/debian/scalapack-openmpi.patch b/debian/scalapack-openmpi.patch
new file mode 100644
index 0000000..3844234
--- /dev/null
+++ b/debian/scalapack-openmpi.patch
@@ -0,0 +1,45 @@
+diff -urN scalapack-1.8.0-2/SLmake.inc scalapack-1.8.0/SLmake.inc
+--- scalapack-1.8.0-2/SLmake.inc 2008-08-14 11:28:24.000000000 -0400
++++ scalapack-1.8.0/SLmake.inc 2008-08-14 12:34:26.000000000 -0400
+@@ -33,15 +33,30 @@
+ #
+ # MPI setup; tailor to your system if using MPIBLACS
+ #
++ifeq ($(MPI),openmpi)
++USEMPI = -DUsingMpiBlacs
++ifeq ($(BUILD),static)
++SMPLIB = -L/usr/lib/openmpi/lib/ -lmpi -lmpi_f77
++BLACSFINIT = /usr/lib/libblacsF77init-openmpi.a
++BLACSCINIT = /usr/lib/libblacsCinit-openmpi.a
++BLACSLIB = /usr/lib/libblacs-openmpi.a
++else
++SMPLIB = -L/usr/lib/openmpi/lib/ -lmpi -lmpi_f77
++BLACSFINIT = -lblacsF77init-openmpi
++BLACSCINIT = -lblacsCinit-openmpi
++BLACSLIB = -lblacs-openmpi
++endif
++TESTINGdir = $(home)/TESTING
++endif
+ ifeq ($(MPI),lam)
+ USEMPI = -DUsingMpiBlacs
+ ifeq ($(BUILD),static)
+-SMPLIB = -lmpi
++SMPLIB = -L/usr/lib/lam/lib -lmpi
+ BLACSFINIT = /usr/lib/libblacsF77init-lam.a
+ BLACSCINIT = /usr/lib/libblacsCinit-lam.a
+ BLACSLIB = /usr/lib/libblacs-lam.a
+ else
+-SMPLIB = -lmpi
++SMPLIB = -L/usr/lib/lam/lib -lmpi
+ BLACSFINIT = -lblacsF77init-lam
+ BLACSCINIT = -lblacsCinit-lam
+ BLACSLIB = -lblacs-lam
+@@ -56,7 +71,7 @@
+ BLACSCINIT = /usr/lib/libblacsCinit-mpich.a
+ BLACSLIB = /usr/lib/libblacs-mpich.a
+ else
+-SMPLIB = /usr/lib/mpich/lib/libmpich.a
++SMPLIB = -L/usr/lib/mpich/lib/shared -lmpich
+ BLACSFINIT = -lblacsF77init-mpich
+ BLACSCINIT = -lblacsCinit-mpich
+ BLACSLIB = -lblacs-mpich
diff --git a/debian/scalapack-pvm-dev.links b/debian/scalapack-pvm-dev.links
deleted file mode 100644
index ed0af27..0000000
--- a/debian/scalapack-pvm-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libscalapack-pvm.so.1 usr/lib/libscalapack-pvm.so
diff --git a/debian/scalapack1-lam.links b/debian/scalapack1-lam.links
deleted file mode 100644
index b9b4b6d..0000000
--- a/debian/scalapack1-lam.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libscalapack-lam.so.1.8.0 usr/lib/libscalapack-lam.so.1
diff --git a/debian/scalapack1-lam.postinst b/debian/scalapack1-lam.postinst
deleted file mode 100644
index e6e736c..0000000
--- a/debian/scalapack1-lam.postinst
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
- ldconfig
-fi
-
-#DEBHELPER#
diff --git a/debian/scalapack1-mpich.dirs b/debian/scalapack1-mpich.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/scalapack1-mpich.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/scalapack1-mpich.links b/debian/scalapack1-mpich.links
deleted file mode 100644
index 255e42d..0000000
--- a/debian/scalapack1-mpich.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libscalapack-mpich.so.1.8.0 usr/lib/libscalapack-mpich.so.1
diff --git a/debian/scalapack1-mpich.postinst b/debian/scalapack1-mpich.postinst
deleted file mode 100644
index e6e736c..0000000
--- a/debian/scalapack1-mpich.postinst
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
- ldconfig
-fi
-
-#DEBHELPER#
diff --git a/debian/scalapack1-pvm.dirs b/debian/scalapack1-pvm.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/scalapack1-pvm.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/scalapack1-pvm.links b/debian/scalapack1-pvm.links
deleted file mode 100644
index 1563368..0000000
--- a/debian/scalapack1-pvm.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libscalapack-pvm.so.1.8.0 usr/lib/libscalapack-pvm.so.1
diff --git a/debian/scalapack1-pvm.postinst b/debian/scalapack1-pvm.postinst
deleted file mode 100644
index e6e736c..0000000
--- a/debian/scalapack1-pvm.postinst
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
- ldconfig
-fi
-
-#DEBHELPER#
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/scalapack.git
More information about the debian-science-commits
mailing list