diff -Nru trilinos-12.12.1/debian/changelog trilinos-12.12.1/debian/changelog
--- trilinos-12.12.1/debian/changelog	2019-01-23 15:47:00.000000000 +0000
+++ trilinos-12.12.1/debian/changelog	2019-02-04 11:02:00.000000000 +0000
@@ -1,3 +1,10 @@
+trilinos (12.12.1-7) unstable; urgency=medium
+
+  * Turn debhelper up to 11
+  * Avoid multiarch conflict in libtrilinos-stokhos-dev
+
+ -- Graham Inggs <ginggs@debian.org>  Mon, 04 Feb 2019 11:02:00 +0000
+
 trilinos (12.12.1-6) unstable; urgency=medium
 
   [ Nico Schlömer ]
diff -Nru trilinos-12.12.1/debian/compat trilinos-12.12.1/debian/compat
--- trilinos-12.12.1/debian/compat	2019-01-21 08:32:00.000000000 +0000
+++ trilinos-12.12.1/debian/compat	2019-01-25 11:20:00.000000000 +0000
@@ -1 +1 @@
-9
+11
diff -Nru trilinos-12.12.1/debian/control trilinos-12.12.1/debian/control
--- trilinos-12.12.1/debian/control	2019-01-23 15:44:00.000000000 +0000
+++ trilinos-12.12.1/debian/control	2019-01-25 11:20:00.000000000 +0000
@@ -4,7 +4,7 @@
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
 Uploaders: Nico Schlömer <nico.schloemer@gmail.com>, Graham Inggs <ginggs@debian.org>
-Build-Depends: debhelper (>= 9.20150628),
+Build-Depends: debhelper (>= 11~),
  cmake (>= 2.8.11),
  gfortran,
  libopenmpi-dev,
diff -Nru trilinos-12.12.1/debian/patches/multiarch.patch trilinos-12.12.1/debian/patches/multiarch.patch
--- trilinos-12.12.1/debian/patches/multiarch.patch	1970-01-01 00:00:00.000000000 +0000
+++ trilinos-12.12.1/debian/patches/multiarch.patch	2019-01-29 12:58:00.000000000 +0000
@@ -0,0 +1,26 @@
+Decription: Avoid multiarch conflict
+ As per Debian's multiarch hinter:
+ libtrilinos-stokhos-dev conflicts on /usr/include/trilinos/Stokhos_config.h
+ on amd64 <-> arm64, mips64el, ppc64el, s390x
+ .
+ Make the header file identical across all architectures
+ by defining HAVE_STOKHOS_INTRINSICS on amd64 and i386
+ where immintrin.h is available.
+Author: Graham Inggs <ginggs@debian.org>
+Last-Update: 2019-01-29
+
+--- a/packages/stokhos/cmake/Stokhos_config.h.in
++++ b/packages/stokhos/cmake/Stokhos_config.h.in
+@@ -108,7 +108,11 @@
+ #cmakedefine HAVE_STOKHOS_OPENMP
+ 
+ /* Define if intrinsics are enabled */
+-#cmakedefine HAVE_STOKHOS_INTRINSICS
++#if defined(__x86_64__) || defined(__i386__)
++#define HAVE_STOKHOS_INTRINSICS
++#else
++#undef HAVE_STOKHOS_INTRINSICS
++#endif
+ 
+ /* Define if C++11 is enabled */
+ #cmakedefine HAVE_STOKHOS_CXX11
diff -Nru trilinos-12.12.1/debian/patches/series trilinos-12.12.1/debian/patches/series
--- trilinos-12.12.1/debian/patches/series	2018-10-12 06:54:00.000000000 +0000
+++ trilinos-12.12.1/debian/patches/series	2019-01-29 11:14:00.000000000 +0000
@@ -1,3 +1,4 @@
 #kokkos-32-bit.patch
 #kokkos-bypass-asserts.patch
 ppc64el-tolerance.patch
+multiarch.patch