Merge version 5.2.0-3+rpi1 and 6.1.0-2 to produce 6.1.0-2+rpi1

diff --cc debian/changelog
index d47a03ff8aa1a572c4dd787b59890dc0439d8aad,57cd3defa26f959640ce68717c7ac713465e30e4..bd3f47ce893df9a80de11ab7a7054f515c6433ee
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,36 +1,43 @@@
- octave (5.2.0-3+rpi1) bullseye-staging; urgency=medium
++octave (6.1.0-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 5.1.0-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 31 Oct 2019 00:51:03 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 18 Jun 2020 16:03:55 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 25 Dec 2020 01:13:04 +0000
++
+ octave (6.1.0-2) unstable; urgency=medium
+ 
+   * Upload to unstable
+ 
+  -- Sébastien Villemot <sebastien@debian.org>  Wed, 09 Dec 2020 10:07:00 +0100
+ 
+ octave (6.1.0-1) experimental; urgency=medium
+ 
+   [ Sébastien Villemot ]
+   * New upstream version 6.1.0
+   * d/copyright: reflect upstream changes
+   * Bump S-V to 4.5.1
+   * Drop transitional packages octave-htmldoc and octave-info
+ 
+   [ Rafael Laboissière ]
+   * d/octave-common.lintian-overrides: Add override for extra-license-file
+   * d/octave-common.lintian-overrides: Add override for
+     image-file-has-unexpected-name
+   * d/octave.lintian-overrides: Use new tag name exit-in-shared-library
+ 
+  -- Sébastien Villemot <sebastien@debian.org>  Sat, 28 Nov 2020 16:46:35 +0100
+ 
+ octave (6.0.90-1) experimental; urgency=medium
+ 
+   * New upstream version 6.0.90
+     - fix stack overflow in Java process reaper (Closes: #961681)
+   * d/copyright: reflect upstream changes.
+     Since copyright notices have been simplified, switch back to a manual method
+     of aggregating them.
+   * load-hdf5-string-crash.patch: drop patch, applied upstream
+   * Bump SONAME to liboctave8
+ 
+  -- Sébastien Villemot <sebastien@debian.org>  Wed, 02 Sep 2020 15:47:23 +0200
  
  octave (5.2.0-3) unstable; urgency=medium