From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 25 Apr 2020 13:35:28 +0000 (+0100)
Subject: Merge version 0.1.4+dfsg-1+rpi1 and 0.1.4+dfsg-2 to produce 0.1.4+dfsg-2+rpi1
X-Git-Tag: archive/raspbian/0.1.4+dfsg-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cb0831221aeda1edf1e4e37958fc3a682a5fad57;p=webdis.git

Merge version 0.1.4+dfsg-1+rpi1 and 0.1.4+dfsg-2 to produce 0.1.4+dfsg-2+rpi1
---

cb0831221aeda1edf1e4e37958fc3a682a5fad57
diff --cc debian/changelog
index 7d31ae7,886c9fd..29a53e4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,15 @@@
- webdis (0.1.4+dfsg-1+rpi1) bullseye-staging; urgency=medium
++webdis (0.1.4+dfsg-2+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 0.1.4+dfsg-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 19 Nov 2019 08:28:46 +0000]
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 19 Nov 2019 08:28:46 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 25 Apr 2020 13:35:28 +0000
++
+ webdis (0.1.4+dfsg-2) unstable; urgency=medium
+ 
+   * Post unittests to python3; Closes: #943271, #951624
+ 
+  -- Sandro Tosi <morph@debian.org>  Fri, 10 Apr 2020 02:40:29 -0400
  
  webdis (0.1.4+dfsg-1) unstable; urgency=medium