Manual merge of version 0.1.94-1+rpi1 and 0.1.94-2 to produce 0.1.94-2+rpi1

diff --cc debian/changelog
index 9f8bf31737cb92814c4e9ccaca8f10b6da42b48c,5138adee6b06d87b620d5409cbec3323fc243d00..00af37404ee5aac63358a603a79770d145069008
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,15 @@@
- sentencepiece (0.1.94-1+rpi1) bullseye-staging; urgency=medium
++sentencepiece (0.1.94-2+rpi1) bullseye-staging; urgency=medium
 +
-   * Apply patch by Adrian Bunk to link with libatomic on some architectures.
-     (see debian bug 977235)
++  [changes brought forward from 0.1.94-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 13 Dec 2020 09:25:55 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 13 Dec 2020 09:25:55 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 07 Jan 2021 23:00:06 +0000
++
+ sentencepiece (0.1.94-2) unstable; urgency=medium
+ 
+   * Fix FTBFS on armel/mipsel (Closes: #977235)
+ 
+  -- Kentaro Hayashi <kenhys@xdump.org>  Wed, 16 Dec 2020 21:18:15 +0900
  
  sentencepiece (0.1.94-1) unstable; urgency=medium