From: Raspbian automatic forward porter <root@raspbian.org>
Date: Mon, 30 Nov 2020 01:22:56 +0000 (+0000)
Subject: Merge version 8.1.0+ds-1+rpi1 and 8.1.0+ds-2 to produce 8.1.0+ds-2+rpi1
X-Git-Tag: archive/raspbian/8.1.0+ds-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f825f8e3226d799cc84908193834da264dd0c96c;p=trafficserver.git

Merge version 8.1.0+ds-1+rpi1 and 8.1.0+ds-2 to produce 8.1.0+ds-2+rpi1
---

f825f8e3226d799cc84908193834da264dd0c96c
diff --cc debian/changelog
index 7736e3f8,a4fc72f6..e20f9f90
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- trafficserver (8.1.0+ds-1+rpi1) bullseye-staging; urgency=medium
++trafficserver (8.1.0+ds-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 8.0.1-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 19 Jan 2019 12:42:48 +0000]
 +  * Use -latomic on raspbian too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 17 Oct 2020 14:02:59 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 30 Nov 2020 01:22:56 +0000
++
+ trafficserver (8.1.0+ds-2) unstable; urgency=medium
+ 
+   * Remove autopkgtest (Closes: #974683)
+ 
+  -- Jean Baptiste Favre <debian@jbfavre.org>  Sun, 22 Nov 2020 18:24:18 +0100
  
  trafficserver (8.1.0+ds-1) unstable; urgency=medium