From: Peter Michael Green Date: Sat, 30 May 2020 11:09:36 +0000 (+0000) Subject: Manual merge of version 5.2.0-1+rpi1 and 5.2.0-2 to produce 5.2.0-2+rpi1 X-Git-Tag: archive/raspbian/5.2.0-2+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7791be7033626dad2011e7d1aef248a7a866d1b0;p=octave.git Manual merge of version 5.2.0-1+rpi1 and 5.2.0-2 to produce 5.2.0-2+rpi1 --- 7791be7033626dad2011e7d1aef248a7a866d1b0 diff --cc debian/changelog index 7edb52e8,1dd45e7d..743b8581 --- a/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 at Thu, 31 Oct 2019 00:51:03 +0000] + * Disable testsuite. + - -- Raspbian forward porter Tue, 18 Feb 2020 11:31:04 +0000 ++ -- Peter Michael Green 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 Wed, 20 May 2020 22:43:17 +0200 octave (5.2.0-1) unstable; urgency=medium diff --cc debian/rules index cc8fa276,c2de09cb..a2d6feca --- a/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: