Merge version 3.10.3-3+rpi1 and 3.10.3-5 to produce 3.10.3-5+rpi1

diff --cc debian/changelog
index c8bd4b8f46b8f4490ee783bf747c01c73037971e,b72f3554ce1b7b048fda80b932c25adfd28647f5..12c13653af1dc8e1a222c36aba0cee1680addce7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,19 +1,29 @@@
- atlas (3.10.3-3+rpi1) buster-staging; urgency=medium
++atlas (3.10.3-5+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 3.10.2-6+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 07 Jan 2015 01:41:03 +0000]
 +  * Use generic build for raspbian.
 +  * Make testsuite failure non-fatal
 +  * Build some stuff for libatlas-test manually as it doesn't seem to get built
 +    if the testsuite fails.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 24 Aug 2017 16:04:25 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 27 Sep 2017 02:29:13 +0000
++
+ atlas (3.10.3-5) unstable; urgency=low
+ 
+   * libatlas3-base Conflicts+Replaces libcblas3. (Closes: #874802)
+   * libatlas-base-dev Conflicts+Replaces libcblas-dev. (Closes: #874803)
+ 
+  -- Sébastien Villemot <sebastien@debian.org>  Wed, 13 Sep 2017 22:29:27 +0200
+ 
+ atlas (3.10.3-4) unstable; urgency=low
+ 
+   * Multi-archify the package.
+     Incidentally, drop the dependency of libatlas-base-dev on libblas-dev, since
+     cblas.h is now managed by the alternative.
+   * kfreebsd.patch: update using the fix applied upstream.
+   * Bump Standards-Version to 4.1.0.
+ 
+  -- Sébastien Villemot <sebastien@debian.org>  Sat, 09 Sep 2017 10:27:50 +0200
  
  atlas (3.10.3-3) unstable; urgency=medium
  

diff --cc debian/rules
index 822b192952e567dae8143a59c85f2a78d7172303,5dfe7af98589fe75c5c1b7b04aca3c9360fa06f3..3156cd7504699ae54fc74841ea47f043fef24db8
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -204,14 -199,9 +200,14 @@@ override_dh_auto_test
        if test -f build/lib/libptcblas.a; then make -C build ptcheck; fi
  
  override_dh_auto_install:
 +      #build some stuff manually that doesn't seem to get built if the testsuite fails
 +      cd build/interfaces/blas/C/testing && $(MAKE)
 +      cd build/interfaces/blas/F77/testing && $(MAKE)
 +
        make -C build install # The build system does not support setting DESTDIR at install time
-       mv debian/tmp/usr/include/*.h debian/tmp/usr/include/atlas/
+       mv debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/cblas.h debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/cblas-atlas.h
  
 +
  # We want packages using libblas/liblapack to depend on any BLAS/LAPACK
  # alternative, and we want packages depending on ATLAS-specific libraries
  # (e.g. libatlas.so) to depend specifically on libatlas3-base.