Merge version 1.195+rpi1 and 1.196 to produce 1.196+rpi1

diff --cc debian/changelog
index 238e05f387b14992347fe7093b2149473abd3cf8,b0ddf473ec99728e6000b5537015fe565f946649..5cd5ed9229e25f5c0d46fa17bc3fbba83f551cf6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,19 @@@
- base-installer (1.195+rpi1) bullseye-staging; urgency=medium
++base-installer (1.196+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>  Thu, 23 Jul 2020 20:37:37 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 25 Aug 2020 19:12:54 +0000
++
+ base-installer (1.196) unstable; urgency=medium
+ 
+   * Team upload
+ 
+   * Revert passing "--extra-suites=unreleased" to debootstrap for ports
+     architectures, unreleased is not always available, this needs to be
+     rethought.
+ 
+  -- Samuel Thibault <sthibault@debian.org>  Mon, 17 Aug 2020 11:59:39 +0200
  
  base-installer (1.195) unstable; urgency=medium