[scalapack] 16/29: Import Debian changes 1.8.0-6

[Muammar El Khatib]

This is an automated email from the git hooks/post-receive script.

muammar pushed a commit to branch master
in repository scalapack.

commit 0e5f9976d9b7b4d90cd30107acf200fd22cbed1b
Author: Muammar El Khatib <muammarelkhatib at gmail.com>
Date:   Mon Apr 19 16:07:49 2010 -0330

    Import Debian changes 1.8.0-6
    
    scalapack (1.8.0-6) unstable; urgency=low
    
      * debian/rules file has been updated for linking against blas and lapack
        instead of blas-3gf and lapack-3. With this change, scalapack does not fail
        to build from source. (Closes: #577895)
      * debian/source directory has been created for specifying 1.0 version in the
        file debian/source/format.
---
 SLmake.inc           |  2 +-
 debian/changelog     | 10 ++++++++++
 debian/control       |  2 +-
 debian/rules         |  8 ++++----
 debian/source/format |  1 +
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/SLmake.inc b/SLmake.inc
index f458689..c15da9d 100644
--- a/SLmake.inc
+++ b/SLmake.inc
@@ -129,7 +129,7 @@ RANLIB        = ranlib
 #  The name of the libraries to be created/linked to
 #
 SCALAPACKLIB  = $(home)/scalapack_$(MPI).a
-BLASLIB       = -llapackgf-3 -lblas-3gf
+BLASLIB       = -llapack -lblas
 # BLASLIB       = /usr/local/lib/libf77blas.a /usr/local/lib/libatlas.a
 #
 ifeq ($(BUILD),static)
diff --git a/debian/changelog b/debian/changelog
index 7429efd..fcc8f81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+scalapack (1.8.0-6) unstable; urgency=low
+
+  * debian/rules file has been updated for linking against blas and lapack 
+    instead of blas-3gf and lapack-3. With this change, scalapack does not fail
+    to build from source. (Closes: #577895)
+  * debian/source directory has been created for specifying 1.0 version in the
+    file debian/source/format.
+
+ -- Muammar El Khatib <muammarelkhatib at gmail.com>  Mon, 19 Apr 2010 15:07:49 -0430
+
 scalapack (1.8.0-5) unstable; urgency=low
 
   * Bumped standards version to 3.8.4.
diff --git a/debian/control b/debian/control
index ffc05c7..2b23a49 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: extra
 Maintainer: Muammar El Khatib <muammarelkhatib at gmail.com>
 Standards-Version: 3.8.4
-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
+Build-Depends: mpi-default-dev, pvm-dev, blacs-pvm-dev, gfortran, liblapack-dev, libblas-dev, debhelper (>= 6), libblacs-mpi-dev
 Homepage: http://www.netlib.org/scalapack/
 
 Package: libscalapack-mpi1
diff --git a/debian/rules b/debian/rules
index e1b4bf4..c7f809c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,7 @@ build-stamp-openmpi: patch-stamp
 	  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;\
+	    lib$$i-openmpi.so.$(version) tmp/*.o -lblas -llapack -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/* ;\
@@ -98,7 +98,7 @@ build-stamp-lam: patch-stamp
 	  ar x ../$${i}_lam.a ;\
 	  cd .. ;\
 	  gcc -shared -Wl,-soname=lib$$i-lam.so.$(version_major) -o \
-	    lib$$i-lam.so.$(version) tmp/*.o -lblas-3gf -llapackgf-3 -lblacsCinit-lam -lblacs-lam -llam -lgfortran;\
+	    lib$$i-lam.so.$(version) tmp/*.o -lblas -llapack -lblacsCinit-lam -lblacs-lam -llam -lgfortran;\
 	  ln -snf lib$$i-lam.so.$(version) lib$$i-lam.so.$(version_major) ;\
 	  ln -snf lib$$i-lam.so.$(version_major) lib$$i-lam.so ;\
 	  rm tmp/* ;\
@@ -147,7 +147,7 @@ build-stamp-mpich: patch-stamp
 	  ar x ../$${i}_mpich.a ;\
 	  cd .. ;\
 	  gcc -shared -Wl,-soname=lib$$i-mpich.so.$(version_major) -o \
-	    lib$$i-mpich.so.$(version) tmp/*.o -lblas-3gf -llapackgf-3 -lblacsCinit-mpich -lblacs-mpich -L /usr/lib/mpich/lib/shared -lmpich -lgfortran;\
+	    lib$$i-mpich.so.$(version) tmp/*.o -lblas -llapack -lblacsCinit-mpich -lblacs-mpich -L /usr/lib/mpich/lib/shared -lmpich -lgfortran;\
 	  ln -snf lib$$i-mpich.so.$(version) lib$$i-mpich.so.$(version_major) ;\
 	  ln -snf lib$$i-mpich.so.$(version_major) lib$$i-mpich.so ;\
 	  rm tmp/* ;\
@@ -190,7 +190,7 @@ build-stamp-pvm: patch-stamp
 	  ar x ../$${i}_pvm.a ;\
 	  cd .. ;\
 	  gcc -shared -Wl,-soname=lib$$i-pvm.so.$(version_major) -o \
-	    lib$$i-pvm.so.$(version) tmp/*.o -lblas-3gf -llapackgf-3 -lblacs-pvm -lpvm3 -lgfortran;\
+	    lib$$i-pvm.so.$(version) tmp/*.o -lblas -llapack -lblacs-pvm -lpvm3 -lgfortran;\
 	  ln -snf lib$$i-pvm.so.$(version) lib$$i-pvm.so.$(version_major) ;\
 	  ln -snf lib$$i-pvm.so.$(version_major) lib$$i-pvm.so ;\
 	  rm tmp/* ;\
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/scalapack.git