From: Raspbian forward pporter <root@raspbian.org>
Date: Tue, 4 Dec 2018 20:02:57 +0000 (+0000)
Subject: Merge version 3.6.1-4+rpi1 and 3.6.1.1-1 to produce 3.6.1.1-1+rpi1
X-Git-Tag: archive/raspbian/3.6.1.1-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6624f23540b7bf26d391e9cadc7e40458551e0ee;p=protobuf.git

Merge version 3.6.1-4+rpi1 and 3.6.1.1-1 to produce 3.6.1.1-1+rpi1
---

6624f23540b7bf26d391e9cadc7e40458551e0ee
diff --cc debian/changelog
index a2b0941,cb87047..36ea1ed
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,15 @@@
- protobuf (3.6.1-4+rpi1) buster-staging; urgency=medium
++protobuf (3.6.1.1-1+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 3.6.1-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 25 Oct 2018 12:28:38 +0000]
 +  * Add armhf to libatomic architectures list.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 25 Oct 2018 12:28:38 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 04 Dec 2018 20:02:57 +0000
++
+ protobuf (3.6.1.1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Mon, 26 Nov 2018 23:23:31 +0000
  
  protobuf (3.6.1-4) unstable; urgency=medium