diff -Nru emoslib-4.5.9/debian/changelog emoslib-4.5.9/debian/changelog
--- emoslib-4.5.9/debian/changelog	2020-06-22 15:38:30.000000000 +0000
+++ emoslib-4.5.9/debian/changelog	2020-08-03 19:47:15.000000000 +0000
@@ -1,3 +1,13 @@
+emoslib (2:4.5.9-6) unstable; urgency=medium
+
+  * Fix needed for gfortran-10 changes. Closes: #966956
+  * Move to debhelper level 13.
+  * Use subst vars rather than autogenerated dh files.
+  * List all non-installed files in d/not-installed.
+    Ship libemos*. headers, links.sh script
+
+ -- Alastair McKinstry <mckinstry@debian.org>  Mon, 03 Aug 2020 20:47:15 +0100
+
 emoslib (2:4.5.9-5) unstable; urgency=medium
 
   * Set ECBUILD_MACROS_DIR to fix FTBFS. Closes: #963404
diff -Nru emoslib-4.5.9/debian/control emoslib-4.5.9/debian/control
--- emoslib-4.5.9/debian/control	2020-06-22 15:38:30.000000000 +0000
+++ emoslib-4.5.9/debian/control	2020-08-03 19:47:15.000000000 +0000
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry@debian.org>
-Build-Depends: debhelper-compat (=12), 
+Build-Depends: debhelper-compat (=13), 
  gfortran | fortran-compiler, 
  ecbuild (>= 3.3.0-2),
  libboost-dev (>= 1.47.0), 
diff -Nru emoslib-4.5.9/debian/libemos0d.install emoslib-4.5.9/debian/libemos0d.install
--- emoslib-4.5.9/debian/libemos0d.install	1970-01-01 00:00:00.000000000 +0000
+++ emoslib-4.5.9/debian/libemos0d.install	2020-08-03 19:47:15.000000000 +0000
@@ -0,0 +1 @@
+lib/*.0d	usr/lib/${DEB_HOST_MULTIARCH}
diff -Nru emoslib-4.5.9/debian/libemos0d.install.in emoslib-4.5.9/debian/libemos0d.install.in
--- emoslib-4.5.9/debian/libemos0d.install.in	2020-06-22 15:38:30.000000000 +0000
+++ emoslib-4.5.9/debian/libemos0d.install.in	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-lib/*.0d	usr/lib/@ARCH@
diff -Nru emoslib-4.5.9/debian/libemos-data.install emoslib-4.5.9/debian/libemos-data.install
--- emoslib-4.5.9/debian/libemos-data.install	2020-06-22 15:38:30.000000000 +0000
+++ emoslib-4.5.9/debian/libemos-data.install	2020-08-03 19:47:15.000000000 +0000
@@ -3,3 +3,4 @@
 share/libemos/tables/gribtables/*	/usr/share/emos/gribtables
 share/libemos/tables/gribtemplates/*	/usr/share/emos/gribtemplates
 usr/share/emos/interpol/*	/usr/share/emos/interpol
+share/libemos/tables/bufrtables/links.sh	/usr/share/emos/bufrtables
diff -Nru emoslib-4.5.9/debian/libemos-dev.install emoslib-4.5.9/debian/libemos-dev.install
--- emoslib-4.5.9/debian/libemos-dev.install	1970-01-01 00:00:00.000000000 +0000
+++ emoslib-4.5.9/debian/libemos-dev.install	2020-08-03 19:47:15.000000000 +0000
@@ -0,0 +1,9 @@
+pbio/*.h		usr/include/pbio
+gribex/*.h		usr/include/gribex
+include/libemos/*.h		usr/include/libemos
+interpolation/*.h	usr/include/interpolation
+obj-*/e*.pc		usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+lib/*.a		usr/lib/${DEB_HOST_MULTIARCH}
+share/libemos/cmake/*	usr/lib/${DEB_HOST_MULTIARCH}/cmake/libemos
+lib/*.so		usr/lib/${DEB_HOST_MULTIARCH}
+share/libemos/tables/bufrtables/VERSION.cmake usr/lib/${DEB_HOST_MULTIARCH}/cmake/libemos
diff -Nru emoslib-4.5.9/debian/libemos-dev.install.in emoslib-4.5.9/debian/libemos-dev.install.in
--- emoslib-4.5.9/debian/libemos-dev.install.in	2020-06-22 15:38:30.000000000 +0000
+++ emoslib-4.5.9/debian/libemos-dev.install.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-pbio/*.h		usr/include/pbio
-gribex/*.h		usr/include/gribex
-interpolation/*.h	usr/include/interpolation
-obj-*/e*.pc		usr/lib/@ARCH@/pkgconfig
-lib/*.a		usr/lib/@ARCH@
-share/libemos/cmake/*	usr/lib/@ARCH@/cmake/libemos
diff -Nru emoslib-4.5.9/debian/libemos-dev.links emoslib-4.5.9/debian/libemos-dev.links
--- emoslib-4.5.9/debian/libemos-dev.links	1970-01-01 00:00:00.000000000 +0000
+++ emoslib-4.5.9/debian/libemos-dev.links	2020-08-03 19:47:15.000000000 +0000
@@ -0,0 +1,6 @@
+/usr/lib/${DEB_HOST_MULTIARCH}/libemos.so.0d /usr/lib/${DEB_HOST_MULTIARCH}/libemos.so
+/usr/lib/${DEB_HOST_MULTIARCH}/libemosR64.so.0d /usr/lib/${DEB_HOST_MULTIARCH}/libemosR64.so
+/usr/lib/${DEB_HOST_MULTIARCH}/libemos.so.0d /usr/lib/${DEB_HOST_MULTIARCH}/libemos.R32.D64.I32.so
+/usr/lib/${DEB_HOST_MULTIARCH}/libemosR64.so.0d /usr/lib/${DEB_HOST_MULTIARCH}/libemos.R64.D64.I32.so
+/usr/lib/${DEB_HOST_MULTIARCH}/libemos.a /usr/lib/${DEB_HOST_MULTIARCH}/libemos.R32.D64.I32.a
+/usr/lib/${DEB_HOST_MULTIARCH}/libemosR64.a /usr/lib/${DEB_HOST_MULTIARCH}/libemos.R64.D64.I32.a
diff -Nru emoslib-4.5.9/debian/libemos-dev.links.in emoslib-4.5.9/debian/libemos-dev.links.in
--- emoslib-4.5.9/debian/libemos-dev.links.in	2020-06-22 15:38:30.000000000 +0000
+++ emoslib-4.5.9/debian/libemos-dev.links.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-/usr/lib/@ARCH@/libemos.so.0d /usr/lib/@ARCH@/libemos.so
-/usr/lib/@ARCH@/libemosR64.so.0d /usr/lib/@ARCH@/libemosR64.so
-/usr/lib/@ARCH@/libemos.so.0d /usr/lib/@ARCH@/libemos.R32.D64.I32.so
-/usr/lib/@ARCH@/libemosR64.so.0d /usr/lib/@ARCH@/libemos.R64.D64.I32.so
-/usr/lib/@ARCH@/libemos.a /usr/lib/@ARCH@/libemos.R32.D64.I32.a
-/usr/lib/@ARCH@/libemosR64.a /usr/lib/@ARCH@/libemos.R64.D64.I32.a
diff -Nru emoslib-4.5.9/debian/not-installed emoslib-4.5.9/debian/not-installed
--- emoslib-4.5.9/debian/not-installed	1970-01-01 00:00:00.000000000 +0000
+++ emoslib-4.5.9/debian/not-installed	2020-08-03 19:47:15.000000000 +0000
@@ -0,0 +1,8 @@
+lib/pkgconfig/libemos.pc
+lib/pkgconfig/libemosR64.pc
+lib/pkgconfig/emosR64.pc
+lib/pkgconfig/emos.pc
+share/libemos/tables/land_sea_mask
+share/libemos/tables/bufrtables/CMakeLists.txt
+share/libemos/tables/bufrtables/.gitignore
+share/libemos/tables/bufrtables/VERSION.cmake
diff -Nru emoslib-4.5.9/debian/rules emoslib-4.5.9/debian/rules
--- emoslib-4.5.9/debian/rules	2020-06-22 15:38:30.000000000 +0000
+++ emoslib-4.5.9/debian/rules	2020-08-03 19:47:15.000000000 +0000
@@ -15,13 +15,12 @@
 
 # gfortran warns of type mismatch on Fortran/C code. Not worth fixing this by redesign
 # (porting to F90) when its being replaced by mir. Just disable the warning
-GF10_FLAGS:=$(if $(filter $(shell readlink /usr/bin/gfortran), /usr/bin/gfortran-10), \
+GF10_FLAGS:=$(if $(filter $(shell readlink /usr/bin/gfortran), gfortran-10), \
 		 -fallow-argument-mismatch, )
 
 DESTDIR:=$(shell pwd)/debian/tmp
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 ARCH:=$(shell dpkg --print-architecture)
-AUTOGENERATED:= libemos-dev.install libemos-dev.links libemos0d.install
 LIBDIR:=/usr/lib/${DEB_HOST_MULTIARCH}
 CMAKE_DIR:=debian/tmp/share/libemos/cmake
 DO_TEST:=true
@@ -39,6 +38,9 @@
 FFLAGS:=$(shell dpkg-buildflags --get FCFLAGS ) $(GF10_FLAGS) 
 endif
 
+export FCFLAGS=$(FFLAGS)
+export FFLAGS FCFLAGS
+
 # Do tests on little-endian only for the moment;
 ENDIAN:=$(shell dpkg-architecture -qDEB_BUILD_ARCH_ENDIAN)
 
@@ -74,7 +76,6 @@
 
 override_dh_auto_clean:
 	find bufrtables -type l -delete
-	rm -f $(patsubst %, debian/%, ${AUTOGENERATED})
 	dh_auto_clean
 
 override_dh_auto_configure:
@@ -94,9 +95,6 @@
 		-DINTERPOL_TABLES_PATH=/usr/share/emos \
 		-DBUFR_TABLES_PATH=/usr/share/emos/bufrtables \
 		-DTEST_BUFR_TABLES_PATH=${CURDIR}/bufrtables
-	for f in ${AUTOGENERATED} ; do \
-		sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g' < debian/$$f.in  > debian/$$f ; \
-		done
 
 override_dh_auto_install:
 	cd obj-* && $(MAKE) install