--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package lam
This package represents a minimal change to restore alternative
compatibility with the other mpi implementations in Debian (see #924452,
#922633). It will also remove FTBFS issues for existing netpipe and
xmpi packages in testing. In all, three AUTORM issues will be resolved.
Take care,
=============================================================================
source debdiff
=============================================================================
diff -Nru lam-7.1.4/debian/changelog lam-7.1.4/debian/changelog
--- lam-7.1.4/debian/changelog 2014-03-15 02:47:33.000000000 +0000
+++ lam-7.1.4/debian/changelog 2019-03-29 17:36:04.000000000 +0000
@@ -1,4 +1,39 @@
-lam (7.1.4-3.1) unstable; urgency=medium
+lam (7.1.4-6) unstable; urgency=medium
+
+ * Minimal RC fix for testing migration
+
+ -- Camm Maguire <camm@debian.org> Fri, 29 Mar 2019 17:36:04 +0000
+
+lam (7.1.4-5) unstable; urgency=medium
+
+ * fix /usr/lib/lam/lib/* links in lam4-dev
+
+ -- Camm Maguire <camm@debian.org> Mon, 25 Mar 2019 02:24:32 +0000
+
+lam (7.1.4-4) unstable; urgency=high
+
+ * Accept non-maintaner upload. Thanks Eric Dorland <eric@debian.org>
+ * priority optional, thanks Andreas Beckmann <anbe@debian.org>
+ * debhelper compat level 9
+ * remove obsolete conflicts/replace, thanks Andreas Beckmann <anbe@debian.org>
+ * remove mpi virtual package, thanks Andreas Beckmann <anbe@debian.org>
+ * add breaks against old style alternatives, thanks Andreas Beckmann
+ <anbe@debian.org>
+ * multiarch for liblam4, thanks Andreas Beckmann <anbe@debian.org>
+ * multiarch support in lam4-dev.{prerm,postinst}.in and rules, thanks Andreas
+ Beckmann <anbe@debian.org>, (Closes: #924452, #922633)
+ * remove old mpi alternative when appropriate in lam4-dev.preinst, thanks
+ Andreas Beckmann <anbe@debian.org>
+ * remove obsolete ldconfig call in liblam4.postinst, thanks Andreas Beckmann
+ <anbe@debian.org>
+ * thanks to Aron Xu. (Closes: #721437)
+ * standard debian build flags
+ * lintian cleanups
+ * latest standards
+
+ -- Camm Maguire <camm@debian.org> Thu, 21 Mar 2019 21:53:46 +0000
+
+am (7.1.4-3.1) unstable; urgency=medium
* Non-maintainer upload.
* Drop unnecessary autoconf and automake1.9 build deps. (Closes:
diff -Nru lam-7.1.4/debian/control lam-7.1.4/debian/control
--- lam-7.1.4/debian/control 2014-03-15 02:45:39.000000000 +0000
+++ lam-7.1.4/debian/control 2019-03-29 17:36:04.000000000 +0000
@@ -34,11 +34,13 @@
Package: liblam4
Section: libs
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends},${misc:Depends}
Provides: mpi
Conflicts: lam,lam1,lam4,lam4c2
Replaces: lam,lam1,lam4,lam4c2
Recommends: lam-runtime
+Breaks: libopenmpi-dev (<< 3.0.1~rc1-2), openmpi-bin (<< 3.0.1~rc1-2), mpich (<< 3.3~a3-2), libmpich-dev (<< 3.3~a3-2)
Description: Shared libraries used by LAM parallel programs
LAM (Local Area Multicomputer) is an open source implementation of the
Message Passing Interface (MPI) standard.
diff -Nru lam-7.1.4/debian/lam4-dev.postinst lam-7.1.4/debian/lam4-dev.postinst
--- lam-7.1.4/debian/lam4-dev.postinst 2012-04-05 20:07:37.000000000 +0000
+++ lam-7.1.4/debian/lam4-dev.postinst 1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --install /usr/include/mpi mpi /usr/include/lam 30 \
- --slave /usr/lib/libmpi.so libmpi.so /usr/lib/liblam.so \
- --slave /usr/lib/libmpio.so libmpio.so /usr/lib/liblamio.so \
- --slave /usr/lib/libmpi++.so libmpi++.so /usr/lib/liblam++.so \
- --slave /usr/lib/libmpi.a libmpi.a /usr/lib/liblam.a \
- --slave /usr/lib/libmpio.a libmpio.a /usr/lib/liblamio.a \
- --slave /usr/lib/libmpi++.a libmpi++.a /usr/lib/liblam++.a \
- --slave /usr/bin/mpicc mpicc /usr/bin/mpicc.lam \
- --slave /usr/share/man/man1/mpicc.1.gz mpicc.1.gz /usr/share/man/man1/mpicc.lam.1.gz \
- --slave /usr/bin/mpif77 mpif77 /usr/bin/mpif77.lam \
- --slave /usr/share/man/man1/mpif77.1.gz mpif77.1.gz /usr/share/man/man1/mpif77.lam.1.gz \
- --slave /usr/bin/mpiCC mpiCC /usr/bin/mpic++.lam \
- --slave /usr/share/man/man1/mpiCC.1.gz mpiCC.1.gz /usr/share/man/man1/mpiCC.lam.1.gz \
- --slave /usr/bin/mpic++ mpic++ /usr/bin/mpic++.lam \
- --slave /usr/share/man/man1/mpic++.1.gz mpic++.1.gz /usr/share/man/man1/mpic++.lam.1.gz
-
-update-alternatives \
- --install /usr/share/man/man3/MPI_Comm_set_name.3.gz MPI_Comm_set_name.3.gz /usr/share/man/man3/MPI_Comm_set_name_lam4-dev.3.gz 10
-
-
-#DEBHELPER#
-
-exit 0
diff -Nru lam-7.1.4/debian/lam4-dev.postinst.in lam-7.1.4/debian/lam4-dev.postinst.in
--- lam-7.1.4/debian/lam4-dev.postinst.in 1970-01-01 00:00:00.000000000 +0000
+++ lam-7.1.4/debian/lam4-dev.postinst.in 2019-03-29 17:30:31.000000000 +0000
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+
+ update-alternatives \
+ --install /usr/include/@DEB_HOST_MULTIARCH@/mpi mpi-@DEB_HOST_MULTIARCH@ /usr/include/lam 30 \
+ --slave /usr/lib/@DEB_HOST_MULTIARCH@/libmpi.so libmpi.so-@DEB_HOST_MULTIARCH@ /usr/lib/@DEB_HOST_MULTIARCH@/liblam.so \
+ --slave /usr/lib/@DEB_HOST_MULTIARCH@/libmpio.so libmpio.so-@DEB_HOST_MULTIARCH@ /usr/lib/@DEB_HOST_MULTIARCH@/liblamio.so \
+ --slave /usr/lib/@DEB_HOST_MULTIARCH@/libmpi++.so libmpi++.so-@DEB_HOST_MULTIARCH@ /usr/lib/@DEB_HOST_MULTIARCH@/liblam++.so \
+ --slave /usr/lib/@DEB_HOST_MULTIARCH@/libmpi.a libmpi.a-@DEB_HOST_MULTIARCH@ /usr/lib/@DEB_HOST_MULTIARCH@/liblam.a \
+ --slave /usr/lib/@DEB_HOST_MULTIARCH@/libmpio.a libmpio.a-@DEB_HOST_MULTIARCH@ /usr/lib/@DEB_HOST_MULTIARCH@/liblamio.a \
+ --slave /usr/lib/@DEB_HOST_MULTIARCH@/libmpi++.a libmpi++.a-@DEB_HOST_MULTIARCH@ /usr/lib/@DEB_HOST_MULTIARCH@/liblam++.a
+
+ update-alternatives \
+ --install /usr/bin/mpicc mpi /usr/bin/mpicc.lam 30 \
+ --slave /usr/share/man/man1/mpicc.1.gz mpicc.1.gz /usr/share/man/man1/mpicc.lam.1.gz \
+ --slave /usr/bin/mpif77 mpif77 /usr/bin/mpif77.lam \
+ --slave /usr/share/man/man1/mpif77.1.gz mpif77.1.gz /usr/share/man/man1/mpif77.lam.1.gz \
+ --slave /usr/bin/mpiCC mpiCC /usr/bin/mpic++.lam \
+ --slave /usr/share/man/man1/mpiCC.1.gz mpiCC.1.gz /usr/share/man/man1/mpiCC.lam.1.gz \
+ --slave /usr/bin/mpic++ mpic++ /usr/bin/mpic++.lam \
+ --slave /usr/share/man/man1/mpic++.1.gz mpic++.1.gz /usr/share/man/man1/mpic++.lam.1.gz
+
+ update-alternatives \
+ --install /usr/share/man/man3/MPI_Comm_set_name.3.gz MPI_Comm_set_name.3.gz /usr/share/man/man3/MPI_Comm_set_name_lam4-dev.3.gz 10
+
+fi
+
+#DEBHELPER#
diff -Nru lam-7.1.4/debian/lam4-dev.preinst lam-7.1.4/debian/lam4-dev.preinst
--- lam-7.1.4/debian/lam4-dev.preinst 2012-04-05 17:28:01.000000000 +0000
+++ lam-7.1.4/debian/lam4-dev.preinst 2019-03-29 17:30:31.000000000 +0000
@@ -1,52 +1,9 @@
#! /bin/sh
-# preinst script for #PACKAGE#
-#
-# see: dh_installdeb(1)
set -e
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-
-case "$1" in
- install|upgrade)
-# if [ "$1" = "upgrade" ]
-# then
-# start-stop-daemon --stop --quiet --oknodo \
-# --pidfile /var/run/#PACKAGE#.pid \
-# --exec /usr/sbin/#PACKAGE# 2>/dev/null || true
-# fi
-
- if [ "$1" = "install" ] ; then
- if [ -L /usr/lib/lam/lib ] ; then
- rm /usr/lib/lam/lib;
- mkdir /usr/lib/lam/lib;
- fi
- if [ -L /usr/include/lam/mpi2c++ ] ; then
- rm /usr/include/lam/mpi2c++;
- mkdir /usr/include/lam/mpi2c++;
- fi
- fi
-
- ;;
-
- abort-upgrade)
- ;;
-
- *)
- echo "preinst called with unknown argument \`$1'" >&2
- exit 0
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
+if dpkg --compare-versions "$2" le-nl "7.1.4-3.1" ; then
+ update-alternatives --remove mpi /usr/include/lam
+fi
#DEBHELPER#
-
-exit 0
-
-
diff -Nru lam-7.1.4/debian/lam4-dev.prerm lam-7.1.4/debian/lam4-dev.prerm
--- lam-7.1.4/debian/lam4-dev.prerm 2012-04-05 20:08:08.000000000 +0000
+++ lam-7.1.4/debian/lam4-dev.prerm 1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" != "upgrade" ]
-then
- update-alternatives --remove mpi /usr/include/lam
- update-alternatives --remove MPI_Comm_set_name.3.gz /usr/share/man/man3/MPI_Comm_set_name_lam4-dev.3.gz
-fi
-
-#DEBHELPER#
-
-exit 0
diff -Nru lam-7.1.4/debian/lam4-dev.prerm.in lam-7.1.4/debian/lam4-dev.prerm.in
--- lam-7.1.4/debian/lam4-dev.prerm.in 1970-01-01 00:00:00.000000000 +0000
+++ lam-7.1.4/debian/lam4-dev.prerm.in 2019-03-29 17:30:31.000000000 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" != "upgrade" ] ; then
+ update-alternatives --remove mpi-@DEB_HOST_MULTIARCH@ /usr/include/lam
+ update-alternatives --remove mpi /usr/bin/mpicc.lam
+ update-alternatives --remove MPI_Comm_set_name.3.gz /usr/share/man/man3/MPI_Comm_set_name_lam4-dev.3.gz
+fi
+
+#DEBHELPER#
diff -Nru lam-7.1.4/debian/liblam4.postinst lam-7.1.4/debian/liblam4.postinst
--- lam-7.1.4/debian/liblam4.postinst 2012-04-05 14:02:40.000000000 +0000
+++ lam-7.1.4/debian/liblam4.postinst 1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
- ldconfig
-fi
-
-#DEBHELPER#
diff -Nru lam-7.1.4/debian/rules lam-7.1.4/debian/rules
--- lam-7.1.4/debian/rules 2012-04-06 20:36:07.000000000 +0000
+++ lam-7.1.4/debian/rules 2019-03-29 17:34:29.000000000 +0000
@@ -49,6 +49,7 @@
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
export DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
ARCHT:=$(shell echo $(DEB_HOST_GNU_TYPE) | cut -f1 -d-)
OPTFLAGS:=
@@ -440,11 +441,26 @@
rm -rf $(MDIR)/usr/lib/lam/bin/.libs
dh_movefiles
mv ./debian/lam4-dev/usr/share/man/man3/MPI_Comm_set_name.3 ./debian/lam4-dev/usr/share/man/man3/MPI_Comm_set_name_lam4-dev.3
+ mkdir -p debian/liblam$(SO)/usr/lib/$(DEB_HOST_MULTIARCH)
+ mv debian/liblam$(SO)/usr/lib/lib* debian/liblam$(SO)/usr/lib/$(DEB_HOST_MULTIARCH)
+ mkdir -p debian/lam$(SO)-dev/usr/lib/$(DEB_HOST_MULTIARCH)
+ mv debian/lam$(SO)-dev/usr/lib/lib* debian/lam$(SO)-dev/usr/lib/$(DEB_HOST_MULTIARCH)
+ for i in debian/lam$(SO)-dev/usr/lib/lam/lib/*; do \
+ j=$$(readlink $$i);\
+ ln -snf $$(dirname $$j)/$(DEB_HOST_MULTIARCH)/$$(basename $$j) $$i;\
+ done
build: build-arch build-indep
build-arch: build-stamp
build-indep: build-stamp
build-stamp: $(stlibs) $(shlibs)
+build-stamp: debian/lam4-dev.prerm debian/lam4-dev.postinst
+
+debian/lam4-dev.prerm: debian/lam4-dev.prerm.in
+ sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@
+
+debian/lam4-dev.postinst: debian/lam4-dev.postinst.in
+ sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@
clean:
dh_testdir
@@ -487,6 +503,8 @@
rm -f share/libltdl/config.h
rm -f share/ssi/crlam/blcr/ssi_crlam_blcr_config.sh debian/lam$(SO).substvars
+ rm -f debian/lam4-dev.prerm debian/lam4-dev.postinst
+
dh_clean
binary-arch: build install
=============================================================================
unblock lam/7.1.4-6
-- System Information:
Debian Release: buster/sid
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 4.9.0-8-amd64 (SMP w/4 CPU cores)
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE=C (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: unable to detect
--
Camm Maguire camm@maguirefamily.org
==========================================================================
"The earth is but one country, and mankind its citizens." -- Baha'u'llah
--- End Message ---
--- Begin Message ---
Hi,
On Tue, Apr 02, 2019 at 05:20:01PM +0200, Andreas Beckmann wrote:
> On Sun, 31 Mar 2019 21:15:03 +0100 Jonathan Wiltshire <jmw@debian.org>
> wrote:
> > I'm afraid this is not "minimal changes". In particular the multi-arch and
> > debhelper compat level changes are not appropriate at this stage.
>
> The debhelper compat bump was already reverted, just not documented in
> the changelog.
>
> The multiarchification is the only way to properly synchronize the
> alternatives handling with openmpi and mpich, all three implementations
> need to be co-installable. There are "normal" alternatives for the
> binaries and multiarch-alternatives for the libraries, while in stretch
> there was only a single alternative for both binaries and libraries. It
> would be a horrible mess to support both schemes at the same time.
> Unfortunately these issues have been neglected for too long.
Based on this explanation, I have unblocked it, on the assumption that you are
willing to fix any issues that might show up with it.
Thanks,
Ivo
--- End Message ---