Manual merge of version 5.2.0-1+rpi1 and 5.2.0-2 to produce 5.2.0-2+rpi1

diff --cc debian/changelog
index 7edb52e84819d1c3f53c065eb135557d5264e136,1dd45e7de86bc43cd33103a5e3668037d8f18827..743b8581f72e339d92fb7c4edbb0ec79bedbcf04
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,31 +1,38 @@@
- octave (5.2.0-1+rpi1) bullseye-staging; urgency=medium
++octave (5.2.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>  Tue, 18 Feb 2020 11:31:04 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 30 May 2020 11:06:29 +0000
++
+ octave (5.2.0-2) unstable; urgency=medium
+ 
+   [ Sébastien Villemot ]
+   * /etc/octave.conf now corresponds to the site-specific octaverc.
+     Previously, it would correspond to the version-specific octaverc. The latter
+     is not really meant to be locally modified.
+   * Move debian_missing_handler.m to site-specific directory.
+     This is more logical since it is now called from the site-specific octaverc.
+     Also, this emphasizes the fact that it’s a Debian customization.
+   * Bump to debhelper 13
+     — drop B-D to dh-exec, instead use new variable substitution mechanism
+     — dh_missing now defaults to --fail-missing
+     — simplify override_dh_auto_test rule
+   * d/rules:
+     — enable dh_dwz, it seems to work now
+     — simplify using debhelper 12.8’s execute_after_* rules
+   * d/control: add Breaks against octave-nlopt < 2.6.1-8~
+     Former version of the package would need recompiling against every new
+     Octave version.
+   * Cosmetic fixes to capitalization of MATLAB®
+   * d/upstream/metadata: various improvements
+ 
+   [ Rafael Laboissière ]
+   * d/p/load-hdf5-string-crash.patch: New patch.
+     Thanks to Elvis Stansvik for the patch
+     (Closes: #959109)
+ 
+  -- Sébastien Villemot <sebastien@debian.org>  Wed, 20 May 2020 22:43:17 +0200
  
  octave (5.2.0-1) unstable; urgency=medium
  

diff --cc debian/rules
index cc8fa276c17ce3d618fd2ab03162d8117355005c,c2de09cb880bdfb0077c898e028665459bba1b4b..a2d6feca2a0f43afd48af042783bf37e8ed23ba8
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -77,11 -72,9 +72,9 @@@ endi
  
  # dh_auto_test tries to run "make test", so override it
  override_dh_auto_test:
- ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 -      make check
 -      # Run builtin-features to ensure important features are included
 -      env OCTAVE=./run-octave debian/tests/builtin-features
 +      #make check
 +      ## Run builtin-features to ensure important features are included
 +      #env OCTAVE=./run-octave debian/tests/builtin-features
- endif
  
  # override normal dh_compress call to avoid compressing .pdf files
  override_dh_compress: