From: Raspbian automatic forward porter <root@raspbian.org>
Date: Mon, 26 Oct 2020 12:13:39 +0000 (+0000)
Subject: Merge version 2.4.53+dfsg-1+rpi1 and 2.4.54+dfsg-1 to produce 2.4.54+dfsg-1+rpi1
X-Git-Tag: raspbian/2.4.54+dfsg-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0ebf467cc83a9d4f842d5b5b736c298d47bad7e7;p=openldap.git

Merge version 2.4.53+dfsg-1+rpi1 and 2.4.54+dfsg-1 to produce 2.4.54+dfsg-1+rpi1
---

f546e39ca6810d1ae86b04e37b2710d3322343e3
diff --cc debian/changelog
index 331ab4e5,54c4191b..75170a88
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,10 +1,17 @@@
- openldap (2.4.53+dfsg-1+rpi1) bullseye-staging; urgency=medium
++openldap (2.4.54+dfsg-1+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 2.4.53+dfsg-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 14 Sep 2020 14:19:10 +0000]
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Mon, 14 Sep 2020 14:19:10 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 26 Oct 2020 12:13:39 +0000
++
+ openldap (2.4.54+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Change upstream Homepage and get-orig-source URLs to HTTPS.
+   * Create debian/gbp.conf.
+ 
+  -- Ryan Tandy <ryan@nardis.ca>  Sun, 18 Oct 2020 16:03:46 +0000
  
  openldap (2.4.53+dfsg-1) unstable; urgency=medium