[scalapack] 20/29: Import Debian changes 1.8.0-9.1

Muammar El Khatib muammar at moszumanska.debian.org
Sun Jun 11 16:16:30 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 284a9582b554e7577e25b1d6148ce4e2092dee3e
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Mon Mar 24 18:20:38 2014 +0100

    Import Debian changes 1.8.0-9.1
    
    scalapack (1.8.0-9.1) unstable; urgency=medium
    
      * Non-maintainer upload.
      * No longer silently change the SONAME of the MPI scalapack shared
        library when the default MPI implementation changes on a given arch.
        (Closes: #740620)
        + Create two new binary packages libscalapack-openmpi1 and
          libscalapack-mpich1, corresponding to the two possible SONAMES.
        + The architecture list for each binary package is stored in debian/rules,
          and debian/control is now generated from debian/control.in by the clean
          rule.
        + Keep a transitional package for libscalapack-mpi1.
        + Make sure that the package FTBFS if the default MPI implementation
          changes on a given arch (instead of silently changing the SONAME or
          creating an empty package).
---
 debian/changelog                     | 18 +++++++++++++
 debian/control                       | 49 +++++++++++++++++++++++++++++++-----
 debian/{control => control.in}       | 44 +++++++++++++++++++++++++++-----
 debian/libscalapack-mpi1.dirs        |  1 -
 debian/libscalapack-mpich1.install   |  1 +
 debian/libscalapack-openmpi1.install |  1 +
 debian/rules                         | 29 ++++++++++++++++++---
 debian/shlibs.local                  |  4 ---
 8 files changed, 126 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 64775ab..7d8fc1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+scalapack (1.8.0-9.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * No longer silently change the SONAME of the MPI scalapack shared
+    library when the default MPI implementation changes on a given arch.
+    (Closes: #740620)
+    + Create two new binary packages libscalapack-openmpi1 and
+      libscalapack-mpich1, corresponding to the two possible SONAMES.
+    + The architecture list for each binary package is stored in debian/rules,
+      and debian/control is now generated from debian/control.in by the clean
+      rule.
+    + Keep a transitional package for libscalapack-mpi1.
+    + Make sure that the package FTBFS if the default MPI implementation
+      changes on a given arch (instead of silently changing the SONAME or
+      creating an empty package).
+
+ -- Sébastien Villemot <sebastien at debian.org>  Mon, 24 Mar 2014 18:20:38 +0100
+
 scalapack (1.8.0-9) unstable; urgency=low
 
   * scalapack failed to build from source with the new mpich2's targets. For
diff --git a/debian/control b/debian/control
index 414190b..b6b1ea2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,3 +1,8 @@
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
 Source: scalapack
 Section: devel
 Priority: extra
@@ -7,13 +12,43 @@ Build-Depends: mpi-default-dev, pvm-dev, blacs-pvm-dev, gfortran, liblapack-dev,
 Homepage: http://www.netlib.org/scalapack/
 
 Package: libscalapack-mpi1
+Section: oldlibs
+Priority: extra
+Architecture: alpha amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc sparc arm64 hppa m68k powerpcspe ppc64 s390x sparc64
+Depends: ${misc:Depends},
+         libscalapack-openmpi1 [alpha amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc sparc],
+         libscalapack-mpich1 [arm64 hppa m68k powerpcspe ppc64 s390x sparc64]
+Description: Scalable Linear Algebra Package - transitional package
+ This package depends on the version of the shared library compiled against
+ the default MPI implementation.
+
+Package: libscalapack-openmpi1
 Section: libs
-Architecture: any
+Architecture: alpha amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc sparc
 Depends: mpi-default-bin, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: scalapack1-mpich, scalapack1-lam
-Replaces: scalapack1-mpich, scalapack1-lam
+Breaks: libscalapack-mpi1 (<< 1.8.0-9.1)
+Replaces: scalapack1-mpich, scalapack1-lam, libscalapack-mpi1 (<< 1.8.0-9.1)
 Suggests: scalapack-doc
-Description: Scalable Linear Algebra Package - Shared libs. for MPI
+Description: Scalable Linear Algebra Package - Shared libs. for OpenMPI
+ 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. 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: libscalapack-mpich1
+Section: libs
+Architecture: arm64 hppa m68k powerpcspe ppc64 s390x sparc64
+Depends: mpi-default-bin, ${shlibs:Depends}, ${misc:Depends}
+Conflicts: scalapack1-mpich, scalapack1-lam
+Breaks: libscalapack-mpi1 (<< 1.8.0-9.1)
+Replaces: scalapack1-mpich, scalapack1-lam, libscalapack-mpi1 (<< 1.8.0-9.1)
+Suggests: scalapack-doc
+Description: Scalable Linear Algebra Package - Shared libs. for MPICH
  ScaLAPACK is the parallel version of LAPACK and is used on Beowulf type
  clusters.
  .
@@ -25,8 +60,10 @@ Description: Scalable Linear Algebra Package - Shared libs. for MPI
 
 Package: libscalapack-mpi-dev
 Section: libdevel
-Architecture: any
-Depends: libscalapack-mpi1 (= ${binary:Version}), libblacs-mpi-dev, ${misc:Depends}
+Architecture: alpha amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc sparc arm64 hppa m68k powerpcspe ppc64 s390x sparc64
+Depends: libscalapack-openmpi1 (= ${binary:Version}) [alpha amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc sparc],
+         libscalapack-mpich1 (= ${binary:Version}) [arm64 hppa m68k powerpcspe ppc64 s390x sparc64],
+         libblacs-mpi-dev, ${misc:Depends}
 Conflicts: scalapack-mpich-dev, scalapack-lam-dev
 Replaces: scalapack-mpich-dev, scalapack-lam-dev
 Suggests: scalapack-doc
@@ -45,7 +82,7 @@ Description: Scalable Linear Algebra Package - Dev. files for MPICH
 
 Package: scalapack-mpi-test
 Section: math
-Architecture: any
+Architecture: alpha amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc sparc arm64 hppa m68k powerpcspe ppc64 s390x sparc64
 Depends: scalapack-test-common, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: scalapack-mpich-test, scalapack-lam-test
 Replaces: scalapack-mpich-test, scalapack-lam-test
diff --git a/debian/control b/debian/control.in
similarity index 74%
copy from debian/control
copy to debian/control.in
index 414190b..4eba183 100644
--- a/debian/control
+++ b/debian/control.in
@@ -7,13 +7,43 @@ Build-Depends: mpi-default-dev, pvm-dev, blacs-pvm-dev, gfortran, liblapack-dev,
 Homepage: http://www.netlib.org/scalapack/
 
 Package: libscalapack-mpi1
+Section: oldlibs
+Priority: extra
+Architecture: @OPENMPI_ARCHS@ @MPICH_ARCHS@
+Depends: ${misc:Depends},
+         libscalapack-openmpi1 [@OPENMPI_ARCHS@],
+         libscalapack-mpich1 [@MPICH_ARCHS@]
+Description: Scalable Linear Algebra Package - transitional package
+ This package depends on the version of the shared library compiled against
+ the default MPI implementation.
+
+Package: libscalapack-openmpi1
 Section: libs
-Architecture: any
+Architecture: @OPENMPI_ARCHS@
+Depends: mpi-default-bin, ${shlibs:Depends}, ${misc:Depends}
+Conflicts: scalapack1-mpich, scalapack1-lam
+Breaks: libscalapack-mpi1 (<< 1.8.0-9.1)
+Replaces: scalapack1-mpich, scalapack1-lam, libscalapack-mpi1 (<< 1.8.0-9.1)
+Suggests: scalapack-doc
+Description: Scalable Linear Algebra Package - Shared libs. for OpenMPI
+ 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. 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: libscalapack-mpich1
+Section: libs
+Architecture: @MPICH_ARCHS@
 Depends: mpi-default-bin, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: scalapack1-mpich, scalapack1-lam
-Replaces: scalapack1-mpich, scalapack1-lam
+Breaks: libscalapack-mpi1 (<< 1.8.0-9.1)
+Replaces: scalapack1-mpich, scalapack1-lam, libscalapack-mpi1 (<< 1.8.0-9.1)
 Suggests: scalapack-doc
-Description: Scalable Linear Algebra Package - Shared libs. for MPI
+Description: Scalable Linear Algebra Package - Shared libs. for MPICH
  ScaLAPACK is the parallel version of LAPACK and is used on Beowulf type
  clusters.
  .
@@ -25,8 +55,10 @@ Description: Scalable Linear Algebra Package - Shared libs. for MPI
 
 Package: libscalapack-mpi-dev
 Section: libdevel
-Architecture: any
-Depends: libscalapack-mpi1 (= ${binary:Version}), libblacs-mpi-dev, ${misc:Depends}
+Architecture: @OPENMPI_ARCHS@ @MPICH_ARCHS@
+Depends: libscalapack-openmpi1 (= ${binary:Version}) [@OPENMPI_ARCHS@],
+         libscalapack-mpich1 (= ${binary:Version}) [@MPICH_ARCHS@],
+         libblacs-mpi-dev, ${misc:Depends}
 Conflicts: scalapack-mpich-dev, scalapack-lam-dev
 Replaces: scalapack-mpich-dev, scalapack-lam-dev
 Suggests: scalapack-doc
@@ -45,7 +77,7 @@ Description: Scalable Linear Algebra Package - Dev. files for MPICH
 
 Package: scalapack-mpi-test
 Section: math
-Architecture: any
+Architecture: @OPENMPI_ARCHS@ @MPICH_ARCHS@
 Depends: scalapack-test-common, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: scalapack-mpich-test, scalapack-lam-test
 Replaces: scalapack-mpich-test, scalapack-lam-test
diff --git a/debian/libscalapack-mpi1.dirs b/debian/libscalapack-mpi1.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libscalapack-mpi1.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libscalapack-mpich1.install b/debian/libscalapack-mpich1.install
new file mode 100644
index 0000000..4b6b9e0
--- /dev/null
+++ b/debian/libscalapack-mpich1.install
@@ -0,0 +1 @@
+libscalapack-mpich.so.* usr/lib
diff --git a/debian/libscalapack-openmpi1.install b/debian/libscalapack-openmpi1.install
new file mode 100644
index 0000000..5842364
--- /dev/null
+++ b/debian/libscalapack-openmpi1.install
@@ -0,0 +1 @@
+libscalapack-openmpi.so.* usr/lib
diff --git a/debian/rules b/debian/rules
index ce2c250..964e159 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,12 @@ topdir=$(shell pwd)
 include /usr/share/mpi-default-dev/debian_defaults
 SCALAPACK_MPI=$(ARCH_DEFAULT_MPI_IMPL)
 
+# This list of archs is maintained separately from that of the mpi-defaults
+# package. If there is a mismatch between the two, the package will FTBFS. This
+# is on purpose, to avoid silent breakage. See #740620 for more details.
+OPENMPI_ARCHS=alpha amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc sparc
+MPICH_ARCHS=arm64 hppa m68k powerpcspe ppc64 s390x sparc64
+
 build: build-$(SCALAPACK_MPI) build-pvm
 
 build-openmpi: build-stamp-openmpi
@@ -277,6 +283,15 @@ clean:
 #	done
 	dh_clean
 
+	{ \
+	  echo "# This file is autogenerated. DO NOT EDIT!" ; \
+	  echo "#" ; \
+	  echo "# Modifications should be made to debian/control.in instead." ; \
+	  echo "# This file is regenerated automatically in the clean target." ; \
+	  echo ; \
+	  sed "s/@OPENMPI_ARCHS@/$(OPENMPI_ARCHS)/g;s/@MPICH_ARCHS@/$(MPICH_ARCHS)/g;" debian/control.in ; } \
+	> debian/control
+
 install: install-dirs install-$(SCALAPACK_MPI) install-pvm
 
 install-dirs: install-dirs-stamp
@@ -303,10 +318,13 @@ install-stamp-openmpi: build-stamp-openmpi
 	dh_testdir
 	dh_testroot
 
+	# The shared library is installed via debian/*.install, to avoid
+	# creating an empty package if default MPI implementation changes on
+	# the arch
+	dh_install
+
 	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
@@ -349,10 +367,13 @@ install-stamp-mpich: build-stamp-mpich
 	dh_testdir
 	dh_testroot
 
+	# The shared library is installed via debian/*.install, to avoid
+	# creating an empty package if default MPI implementation changes on
+	# the arch
+	dh_install
+
 	set -e ;\
 	for i in scalapack ; do \
-	  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
diff --git a/debian/shlibs.local b/debian/shlibs.local
deleted file mode 100644
index c228cbd..0000000
--- a/debian/shlibs.local
+++ /dev/null
@@ -1,4 +0,0 @@
-libscalapack-mpich 1 libscalapack-mpi1 (>= 1.8.0)
-libscalapack-lam 1 libscalapack-mpi1 (>= 1.8.0)
-libscalapack-openmpi 1 libscalapack-mpi1 (>= 1.8.0)
-libscalapack-pvm 1 libscalapack-pvm1 (>= 1.8.0)

-- 
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