Merge version 1.4.1.5-1+rpi1 and 1.4.1.6-4 to produce 1.4.1.6-4+rpi1

diff --cc debian/changelog
index 1d3c92a8617a515633c7380599a8976e9e856957,ab3853c375e84ee578e116cfb29d1c3a3b77b0bb..43bf8ec5148947d02ea8ba4eda2c257015107b68
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,35 +1,42 @@@
- 389-ds-base (1.4.1.5-1+rpi1) bullseye-staging; urgency=medium
++389-ds-base (1.4.1.6-4+rpi1) bullseye-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>  Sat, 07 Sep 2019 02:11:30 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 27 Sep 2019 22:11:58 +0000
++
+ 389-ds-base (1.4.1.6-4) unstable; urgency=medium
+ 
+   * tests: Redirect stderr to stdout.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 17 Sep 2019 01:37:39 +0300
+ 
+ 389-ds-base (1.4.1.6-3) unstable; urgency=medium
+ 
+   * control: Add openssl to python3-lib389 depends.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 13 Sep 2019 07:32:27 +0300
+ 
+ 389-ds-base (1.4.1.6-2) unstable; urgency=medium
+ 
+   * Restore perl build partly, setup-ds is still needed for upgrades
+     until Ubuntu 20.04 is released (for versions << 1.4.0.9).
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 12 Sep 2019 14:50:36 +0300
+ 
+ 389-ds-base (1.4.1.6-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * control: Drop direct depends on python from 389-ds-base. (Closes:
+     #936102)
+   * Drop -legacy-tools and other obsolete scripts.
+   * use-bash-instead-of-sh.diff, rename-online-scripts.diff, perl-use-
+     move-instead-of-rename.diff: Dropped, obsolete.
+   * rules: Fix dsconf/dscreate/dsctl/dsidm manpage section.
+   * tests/setup: Migrate to dscreate.
+   * control: Add libnss3-tools to python3-lib389 depends. (Closes: #920025)
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 11 Sep 2019 17:01:03 +0300
  
  389-ds-base (1.4.1.5-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge