From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 21 Jan 2021 22:23:09 +0000 (+0000)
Subject: Manual merge of version 0.1.94-1+rpi1 and 0.1.94-2 to produce 0.1.94-2+rpi1
X-Git-Tag: archive/raspbian/0.1.94-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2d2bd56fb8bb811f818befd0a8956824632d5faf;p=sentencepiece.git

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

2d2bd56fb8bb811f818befd0a8956824632d5faf
diff --cc debian/changelog
index 9f8bf31,5138ade..00af374
--- a/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