Merge version 10.2019031300+rpi1 and 10.2019051400 to produce 10.2019051400+rpi1

diff --cc debian/changelog
index 314e84d2bd6b62dbb6c42348dfa801f20677408c,9a158907fdf046858d69c6049d032961113ea4c1..675a3045dfe19f6fb900b3a36dcce71d1db7df44
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,21 @@@
- lsb (10.2019031300+rpi1) buster-staging; urgency=medium
++lsb (10.2019051400+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 4.1+Debian13+rpi1+nmu1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 08 Nov 2014 12:56:07 +0000]
 +  * change origin and label to look for when interrogating apt for 
 +    distribution information to match those used in the raspbian repository.
 +    (LP: 1069141)
 +  * Try and fail to fix testsuite to work with our new settings
 +  * Disable testsuite
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 19 Mar 2019 16:23:39 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 31 May 2019 05:54:31 +0000
++
+ lsb (10.2019051400) unstable; urgency=medium
+ 
+   [ Harald Dunkel ]
+   * pidofproc: use "pidof -c" to avoid pidofproc results from containers or chroots
+     (Closes: #888743)
+ 
+  -- Didier Raboud <odyx@debian.org>  Tue, 14 May 2019 08:50:39 +0200
  
  lsb (10.2019031300) unstable; urgency=low