diff -Nru libsnl-0.2.1.svn.18/debian/changelog libsnl-0.2.1.svn.18/debian/changelog
--- libsnl-0.2.1.svn.18/debian/changelog	2015-05-01 17:40:16.000000000 +0000
+++ libsnl-0.2.1.svn.18/debian/changelog	2019-01-01 20:26:06.000000000 +0000
@@ -1,3 +1,21 @@
+libsnl (0.2.1.svn.18-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Niels Thykier ]
+  * Set Rules-Requires-Root to no.
+  * Correct clean rule to delete $(INSTALL) instead of debian/%.install.
+  * Remove now redundant "Testsuite" field (dpkg-source inserts this
+    automatically now).
+  * Bump debhelper compat to 12 - only difference is the version
+    restriction in shlibs and smaller dbgsym packages due to dwz.
+
+  [ Helmut Grohne ]
+  * Remove wrong Multi-Arch: foreign from libsnl-dev. (Closes: #911040)
+  * Fix FTCBFS: Pass cross compiler as $(cname). (Closes: #906006)
+
+ -- Niels Thykier <niels@thykier.net>  Tue, 01 Jan 2019 20:26:06 +0000
+
 libsnl (0.2.1.svn.18-1) unstable; urgency=medium
 
   * Initial release (Closes: #783483)
diff -Nru libsnl-0.2.1.svn.18/debian/compat libsnl-0.2.1.svn.18/debian/compat
--- libsnl-0.2.1.svn.18/debian/compat	2015-05-01 17:40:16.000000000 +0000
+++ libsnl-0.2.1.svn.18/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-9
diff -Nru libsnl-0.2.1.svn.18/debian/control libsnl-0.2.1.svn.18/debian/control
--- libsnl-0.2.1.svn.18/debian/control	2015-07-04 20:28:44.000000000 +0000
+++ libsnl-0.2.1.svn.18/debian/control	2019-01-01 20:26:06.000000000 +0000
@@ -1,9 +1,9 @@
 Source: libsnl
 Maintainer: Wolfgang Fuetterer <debian@wlf-online.de>
 Section: libs
-Testsuite: autopkgtest
 Priority: optional
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper-compat (= 12)
+Rules-Requires-Root: no
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/libsnl.git
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/libsnl.git
@@ -14,9 +14,8 @@
 Section: libdevel
 Depends: libsnl0 (= ${binary:Version}),
          ${misc:Depends}
-Multi-Arch: foreign
 Description: Simple Nurbs Library (development files)
- libSNL is a library of routines used for the 
+ libSNL is a library of routines used for the
  manipulation of non-uniform rational B-Splines (NURBS).
  NURBS are widely used in programs  for computer-aided
  design (CAD), manufacturing (CAM) and engineerging (CAE)
@@ -28,13 +27,13 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Multi-Arch: same         
-Pre-Depends: ${misc:Pre-Depends}         
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: Simple Nurbs Library
- libSNL is a library of routines used for the 
+ libSNL is a library of routines used for the
  manipulation of non-uniform rational B-Splines (NURBS).
  NURBS are widely used in programs  for computer-aided
  design (CAD), manufacturing (CAM) and engineerging (CAE)
- to model and representing curves and surfaces. 
+ to model and representing curves and surfaces.
  .
  This package contains the libsnl shared libraries.
diff -Nru libsnl-0.2.1.svn.18/debian/rules libsnl-0.2.1.svn.18/debian/rules
--- libsnl-0.2.1.svn.18/debian/rules	2015-07-04 20:28:44.000000000 +0000
+++ libsnl-0.2.1.svn.18/debian/rules	2019-01-01 20:23:44.000000000 +0000
@@ -15,19 +15,19 @@
 
 %:
 	dh $@ -Dsrc
-	
+
 override_dh_install: ${INSTALL}
 	dh_install
 
 override_dh_auto_build:
-	dh_auto_build -- CFLAGS="$(CFLAGS) $(CPPFLAGS) $(LDFLAGS)"
+	dh_auto_build -- CFLAGS="$(CFLAGS) $(CPPFLAGS) $(LDFLAGS)" 'cname=$$(CXX)'
 
 override_dh_auto_clean:
 	rm -f src/*.o src/make.dep src/libSNL.so.0.2 src/snlTest
-	rm -f debian/%.install debian/%.install
+	rm -f $(INSTALL)
 
 debian/%.install: debian/%.install.in
 	sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@
-	
+
 debian/%.links: debian/%.links.in
 	sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@