diff -Nru octave-struct-1.0.16/debian/changelog octave-struct-1.0.16/debian/changelog
--- octave-struct-1.0.16/debian/changelog	2020-11-27 11:15:49.000000000 +0000
+++ octave-struct-1.0.16/debian/changelog	2020-12-09 17:24:50.000000000 +0000
@@ -1,3 +1,16 @@
+octave-struct (1.0.16-8) unstable; urgency=medium
+
+  * Upload to unstable.
+
+ -- Sébastien Villemot <sebastien@debian.org>  Wed, 09 Dec 2020 18:24:50 +0100
+
+octave-struct (1.0.16-7) experimental; urgency=medium
+
+  * d/p/build-against-octave-6.patch: New patch (Closes: #976204)
+  * d/clean: Delete left-over files src/*.cc-tst
+
+ -- Rafael Laboissière <rafael@debian.org>  Thu, 03 Dec 2020 11:55:10 -0300
+
 octave-struct (1.0.16-6) unstable; urgency=medium
 
   [ Debian Janitor ]
diff -Nru octave-struct-1.0.16/debian/clean octave-struct-1.0.16/debian/clean
--- octave-struct-1.0.16/debian/clean	2017-12-28 10:59:56.000000000 +0000
+++ octave-struct-1.0.16/debian/clean	2020-12-09 17:24:31.000000000 +0000
@@ -2,3 +2,4 @@
 src/config.log
 src/config.status
 src/Makefile
+src/*.cc-tst
diff -Nru octave-struct-1.0.16/debian/patches/build-against-octave-6.patch octave-struct-1.0.16/debian/patches/build-against-octave-6.patch
--- octave-struct-1.0.16/debian/patches/build-against-octave-6.patch	1970-01-01 00:00:00.000000000 +0000
+++ octave-struct-1.0.16/debian/patches/build-against-octave-6.patch	2020-12-09 17:24:31.000000000 +0000
@@ -0,0 +1,27 @@
+Description: Fix FTBFS against Octave 6.1
+ inst/tars.m: Use a loop instead of 'argn' and cell2struct().
+Author: Rafael Laboissière <rafael@debian.org>
+Origin: upstream, https://sourceforge.net/p/octave/struct/ci/854fda65bc8b59933769aa0f701cacacab1878da/
+Bug: https://savannah.gnu.org/bugs/?59342
+Bug-Debian: https://bugs.debian.org/976204
+Forwarded: not-needed
+Last-Update: 2020-12-03
+
+--- octave-struct-1.0.16.orig/inst/tars.m
++++ octave-struct-1.0.16/inst/tars.m
+@@ -23,7 +23,14 @@
+ 
+ function s = tars (varargin)
+ 
+-  s = cell2struct (varargin, deblank (cellstr (argn)), 2);
++  ## cell2struct() probably couldn't be used here without preparations
++  ## that use a loop, too, or which are unsafe
++
++  for id = 1:nargin
++
++    s.(deblank (inputname (id))) = varargin{id};
++
++  endfor
+ 
+ endfunction
+ 
diff -Nru octave-struct-1.0.16/debian/patches/series octave-struct-1.0.16/debian/patches/series
--- octave-struct-1.0.16/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ octave-struct-1.0.16/debian/patches/series	2020-12-09 17:24:31.000000000 +0000
@@ -0,0 +1 @@
+build-against-octave-6.patch