From: Raspbian forward pporter <root@raspbian.org>
Date: Sat, 27 Jan 2018 08:33:22 +0000 (+0000)
Subject: Merge version 3.1-2+rpi1 and 3.2-1 to produce 3.2-1+rpi1
X-Git-Tag: archive/raspbian/3.2-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e38aec3350eb59653f207c6863c80fb10ee62ebf;p=libnitrokey.git

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

e38aec3350eb59653f207c6863c80fb10ee62ebf
diff --cc debian/changelog
index a809e93,5438e87..44373d9
--- a/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