Merge version 1.4.0.19-3+rpi1 and 1.4.0.20-3 to produce 1.4.0.20-3+rpi1

diff --cc debian/changelog
index 9b02f8ce6686dcbf395889eaf68199ef0866581f,bc5275c41d692734c3639af2fc729ee2eeaf7b3e..8ebaa5ba22e5e96d07d0a9f02efd51e526e831e9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,25 +1,32 @@@
- 389-ds-base (1.4.0.19-3+rpi1) buster-staging; urgency=medium
++389-ds-base (1.4.0.20-3+rpi1) buster-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>  Thu, 10 Jan 2019 17:31:04 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 18 Jan 2019 13:51:34 +0000
++
+ 389-ds-base (1.4.0.20-3) unstable; urgency=medium
+ 
+   * control: 389-ds-base should depend on the legacy tools for now.
+     (Closes: #919420)
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 16 Jan 2019 11:30:51 +0200
+ 
+ 389-ds-base (1.4.0.20-2) unstable; urgency=medium
+ 
+   * Upload to unstable.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Mon, 14 Jan 2019 20:03:58 +0200
+ 
+ 389-ds-base (1.4.0.20-1) experimental; urgency=medium
+ 
+   * New upstream release. (Closes: #913821)
+   * fix-nss-path.diff: Fix includes.
+   * Build ds* manpages, add missing build-depends.
+   * Move deprecated tools in a new subpackage.
+   * control: Add python3-lib389 to 389-ds-base depends.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Sun, 13 Jan 2019 21:13:22 +0200
  
  389-ds-base (1.4.0.19-3) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge