Merge version 3.1-2+rpi1 and 3.2-1 to produce 3.2-1+rpi1

diff --cc debian/changelog
index a809e936ddc65d7f919e8bc2d63716d405394e26,5438e8783d70877778e4561fd6ea21cf44e60478..44373d9014f40ea2049261a3b6a0f2eead24ab1f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,10 +1,17 @@@
- libnitrokey (3.1-2+rpi1) buster-staging; urgency=medium
++libnitrokey (3.2-1+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 3.1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 05 Jan 2018 14:06:49 +0000]
 +  * Add symbols file hack for Raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 05 Jan 2018 14:06:49 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 27 Jan 2018 08:33:22 +0000
++
+ libnitrokey (3.2-1) unstable; urgency=medium
+ 
+   * New upstream release
+     - Drop debian/patches/add_pkg_config.patch, included upstream
+   * Add pkg-config to build-depends
+ 
+  -- Scott Kitterman <scott@kitterman.com>  Tue, 16 Jan 2018 21:27:11 -0500
  
  libnitrokey (3.1-2) unstable; urgency=medium