From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 18 Jun 2020 16:03:55 +0000 (+0100)
Subject: Merge version 5.2.0-2+rpi1 and 5.2.0-3 to produce 5.2.0-3+rpi1
X-Git-Tag: archive/raspbian/5.2.0-3+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a04598c5e9568c70b2ec3a471aff45f998dcd9ae;p=octave.git

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

357e71d47cbebfbd81b50046eebf73fe57147446
diff --cc debian/changelog
index 743b8581,f1266cb1..d47a03ff
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- octave (5.2.0-2+rpi1) bullseye-staging; urgency=medium
++octave (5.2.0-3+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 30 May 2020 11:06:29 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 18 Jun 2020 16:03:55 +0000
++
+ octave (5.2.0-3) unstable; urgency=medium
+ 
+   * Rename /etc/octave.conf to /etc/octaverc, for consistency with upstream
+     naming.
+ 
+  -- Sébastien Villemot <sebastien@debian.org>  Fri, 12 Jun 2020 10:15:25 +0200
  
  octave (5.2.0-2) unstable; urgency=medium