[mpi-defaults] 04/06: remove some annoying whitespaces from the generated control file

[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 5d43162d89787eff3bb200e6ef625da03de4b3d8
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sat Feb 27 12:02:19 2016 +0000

    remove some annoying whitespaces from the generated control file
    
    Gbp-Dch: Ignore
---
 debian/control | 8 ++++----
 debian/rules   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index eb37efe..e18689f 100644
--- a/debian/control
+++ b/debian/control
@@ -8,10 +8,10 @@ Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.
 Uploaders: "Adam C. Powell, IV" <hazelsct at debian.org>, Manuel Prinz <manuel at debian.org>
 Standards-Version: 3.9.7
 Build-Depends: debhelper (>= 9),
- libopenmpi-dev (>= 1.4.3-2.1) [alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el s390x sparc64 x32 ],
- openmpi-bin (>= 1.4.3-2.1) [alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el s390x sparc64 x32 ],
- libmpich-dev [hppa m68k sh4 ],
- mpich [hppa m68k sh4 ]
+ libopenmpi-dev (>= 1.4.3-2.1) [alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el s390x sparc64 x32],
+ openmpi-bin (>= 1.4.3-2.1) [alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el s390x sparc64 x32],
+ libmpich-dev [hppa m68k sh4],
+ mpich [hppa m68k sh4]
 Vcs-Browser: https://anonscm.debian.org/git/debian-science/packages/mpi-defaults.git
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/mpi-defaults.git
 
diff --git a/debian/rules b/debian/rules
index 2ca5204..fcefe9e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -120,8 +120,8 @@ override_dh_clean:
 	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%,$(OPENMPI_ARCHITECTURES),g" debian/control.tmp
-	sed -i "s,%MPICH_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
 	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