Merge version 1.2.1-1+rpi1 and 1.2.1-2 to produce 1.2.1-2+rpi1

diff --cc debian/changelog
index a6ace9e500551a12e79e70779995e8f4c264ed8e,32539f9ff863567cad8e2dcea8aa23d2ec7344db..81e01d7570fcad7159700a3e4ea7644d2291ecb7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,9 +1,16 @@@
- libint (1.2.1-1+rpi1) buster-staging; urgency=medium
++libint (1.2.1-2+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 1.2.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 21 Jan 2018 15:26:20 +0000]
 +  * Don't use -march=native
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 21 Jan 2018 15:26:20 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 21 Feb 2018 10:27:19 +0000
++
+ libint (1.2.1-2) unstable; urgency=medium
+ 
+   * debian/libint1.links: Reintroduce lib*-stable.so.1 as symlinks (Closes:
+     #887864, #888274).
+ 
+  -- Michael Banck <mbanck@debian.org>  Mon, 29 Jan 2018 13:13:39 +0100
  
  libint (1.2.1-1) unstable; urgency=medium