Merge version 140+rpi1 and 141 to produce 141+rpi1

diff --cc debian/changelog
index 19a2163cb81fd7f2a7d19457e27910479f9b78c2,8cbae6f6bdff05ea6c2885b8ee517c95032bee9e..c26fa8bdca7b71c047e19a6a70fe3a88ea6d2903
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,13 +1,21 @@@
- partman-basicfilesystems (140+rpi1) buster-staging; urgency=medium
++partman-basicfilesystems (141+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 97+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 31 Jul 2014 21:59:02 +0000]
 +  * Remove fat-modules and ext2-modules dependencies as Raspbian
 +    kernels have the support built in.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 29 Sep 2018 06:24:30 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 22 Oct 2018 11:36:33 +0000
++
+ partman-basicfilesystems (141) unstable; urgency=medium
+ 
+   * Team upload
+ 
+   [ Holger Wansing ]
+   * Fix incorrect order of entries in templates file and refresh all
+     po files. This correctly adds previously missing comments to po files.
+     See https://lists.debian.org/debian-boot/2018/09/msg00183.html.
+ 
+  -- Holger Wansing <hwansing@mailbox.org>  Tue, 16 Oct 2018 21:45:18 +0200
  
  partman-basicfilesystems (140) unstable; urgency=medium