Merge version 1.199+rpi1 and 1.200 to produce 1.200+rpi1

diff --cc debian/changelog
index 13987b2296b02ad822b5f55bb59ba0f9da9dbee8,84212705b3e16af0cc4cf31680464ed7ffac620a..f9837b5733521f509ef1d7ef7ff0ed4fc6fa40d6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,20 @@@
- base-installer (1.199+rpi1) bullseye-staging; urgency=medium
++base-installer (1.200+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 1.148+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 30 Jul 2014 05:27:29 +0000]
 +  * Use raspbian-archive-keyring instead of debian-archive-keyring.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 02 Jan 2021 16:37:39 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 14 Jan 2021 21:03:28 +0000
++
+ base-installer (1.200) unstable; urgency=medium
+ 
+   * Team upload
+ 
+   [ Steve McIntyre ]
+   * Re-add the removed is_ports_architecture() function - it's used by
+     other packages and library.sh looks like a fair central place for
+     it to be. Closes: #979193
+ 
+  -- Steve McIntyre <93sam@debian.org>  Tue, 05 Jan 2021 23:51:17 +0000
  
  base-installer (1.199) unstable; urgency=medium