From: Raspbian automatic forward porter <root@raspbian.org>
Date: Mon, 18 Apr 2022 16:02:48 +0000 (+0100)
Subject: Merge version 2.0.14-1+rpi1 and 2.0.15-1 to produce 2.0.15-1+rpi1
X-Git-Tag: archive/raspbian/2.0.15-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=30443683783c03bf80d455918034edd7e5794ddf;p=389-ds-base.git

Merge version 2.0.14-1+rpi1 and 2.0.15-1 to produce 2.0.15-1+rpi1
---

30443683783c03bf80d455918034edd7e5794ddf
diff --cc debian/changelog
index b9c632f,af86a5a..4d718cf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- 389-ds-base (2.0.14-1+rpi1) bookworm-staging; urgency=medium
++389-ds-base (2.0.15-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1.4.0.19-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 27 Dec 2018 01:27:25 +0000]
 +  * Add -latomic to LDFLAGS on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 18 Feb 2022 05:17:14 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 18 Apr 2022 16:02:47 +0000
++
+ 389-ds-base (2.0.15-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 13 Apr 2022 14:11:20 +0300
  
  389-ds-base (2.0.14-1) unstable; urgency=medium