Merge version 9.9+rpi1+deb9u11 and 9.9+deb9u12 to produce 9.9+rpi1+deb9u12

diff --cc debian/changelog
index 42a41779db91f21d6c8e89e689e176e53738b9ce,1cbf03f46ab506373166bb5e84b7a9c449d5314a..39c73f1cb3aaab1582a551c83a4a76ef5b9b7347
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,8 +1,17 @@@
- base-files (9.9+rpi1+deb9u11) stretch-staging; urgency=medium
++base-files (9.9+rpi1+deb9u12) stretch-staging; urgency=medium
 +
 +  [changes brought forward from 8+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 07 Jan 2015 02:03:42 +0000]
 +  * Modify default vendor etc for raspbian.
 +  * Modify maintainer scripts so default will be set to raspbian even when
 +    upgrading
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Mon, 09 Sep 2019 23:20:47 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 09 Feb 2020 02:23:58 +0000
++
+ base-files (9.9+deb9u12) stretch; urgency=medium
+ 
+   * Change /etc/debian_version to 9.12, for Debian 9.12 point release.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Sat, 01 Feb 2020 18:09:04 +0100
  
  base-files (9.9+deb9u11) stretch; urgency=emergency