[mpi-defaults] 02/02: Make sure architecture lists are sorted.

[Mattia Rizzolo]

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

mattia pushed a commit to branch master
in repository mpi-defaults.

commit 808f66602ca4d38383ee659f7c1ae28ce95e85a1
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Thu Aug 4 10:44:39 2016 +0000

    Make sure architecture lists are sorted.
---
 debian/control |  4 ++--
 debian/rules   | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index e02240f..666362c 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Vcs-Browser: https://anonscm.debian.org/git/debian-science/packages/mpi-defaults
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/mpi-defaults.git
 
 Package: mpi-default-dev
-Architecture: alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc64 x32 m68k sh4
+Architecture: alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 m68k mips mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390x sh4 sparc64 x32
 Section: libdevel
 Depends: ${mpi-dev}, ${misc:Depends}
 Description: Standard MPI development files (metapackage)
@@ -27,7 +27,7 @@ Description: Standard MPI development files (metapackage)
  compilers mpicc, mpic++/mpicxx/mpiCC, mpif77 and mpi90 and their manpages.
 
 Package: mpi-default-bin
-Architecture: alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc64 x32 m68k sh4
+Architecture: alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 m68k mips mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390x sh4 sparc64 x32
 Section: net
 Depends: ${mpi}, ${misc:Depends}
 Description: Standard MPI runtime programs (metapackage)
diff --git a/debian/rules b/debian/rules
index c5a1e2f..fac0fbe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -92,13 +92,13 @@ override_dh_auto_build:
 	echo "# Default MPI implementation on this architecture:" > $d
 	echo "ARCH_DEFAULT_MPI_IMPL=$(MPI)" >> $d
 	echo "# Architectures where OpenMPI is available:" >> $d
-	echo "OPENMPI_AVAILABLE_ARCHITECTURES=$(strip $(OPENMPI_AVAILABLE_ARCHITECTURES))" >> $d
+	echo "OPENMPI_AVAILABLE_ARCHITECTURES=$(strip $(sort $(OPENMPI_AVAILABLE_ARCHITECTURES)))" >> $d
 	echo "# Architectures where MPICH is available:" >> $d
-	echo "MPICH_AVAILABLE_ARCHITECTURES=$(strip $(MPICH_AVAILABLE_ARCHITECTURES))" >> $d
+	echo "MPICH_AVAILABLE_ARCHITECTURES=$(strip $(sort $(MPICH_AVAILABLE_ARCHITECTURES)))" >> $d
 	echo "# Architectures defaulting to OpenMPI:" >> $d
-	echo "OPENMPI_ARCHITECTURES=$(strip $(OPENMPI_ARCHITECTURES))" >> $d
+	echo "OPENMPI_ARCHITECTURES=$(strip $(sort $(OPENMPI_ARCHITECTURES)))" >> $d
 	echo "# Architectures defaulting to MPICH:" >> $d
-	echo "MPICH_ARCHITECTURES=$(strip $(MPICH_ARCHITECTURES))" >> $d
+	echo "MPICH_ARCHITECTURES=$(strip $(sort $(MPICH_ARCHITECTURES)))" >> $d
 
 override_dh_gencontrol:
 	rm -f debian/*.substvars
@@ -124,9 +124,9 @@ override_dh_clean:
 	echo "# EDIT debian/control.in INSTEAD!" >> debian/control.tmp
 	echo "#" >> debian/control.tmp
 	cat debian/control.in >> debian/control.tmp
-	sed -i "s,%SUPPORTED_ARCHITECTURES%,$(strip $(OPENMPI_ARCHITECTURES) $(MPICH_ARCHITECTURES)),g" debian/control.tmp
-	sed -i "s,%OPENMPI_ARCHITECTURES%,$(strip $(OPENMPI_ARCHITECTURES)),g" debian/control.tmp
-	sed -i "s,%MPICH_ARCHITECTURES%,$(strip $(MPICH_ARCHITECTURES)),g" debian/control.tmp
+	sed -i "s,%SUPPORTED_ARCHITECTURES%,$(strip $(sort $(OPENMPI_ARCHITECTURES) $(MPICH_ARCHITECTURES))),g" debian/control.tmp
+	sed -i "s,%OPENMPI_ARCHITECTURES%,$(strip $(sort $(OPENMPI_ARCHITECTURES))),g" debian/control.tmp
+	sed -i "s,%MPICH_ARCHITECTURES%,$(strip $(sort $(MPICH_ARCHITECTURES))),g" debian/control.tmp
 	set -e ; if ! diff -q debian/control debian/control.tmp > /dev/null; then \
 		echo ;\
 		echo "The generated control file differs from the actual one." ;\

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