Merge version 3.6.1.3-2+rpi1 and 3.11.4-3 to produce 3.11.4-3+rpi1

diff --cc debian/changelog
index 53fb99832ae6bc0632a2fba4f1e4075e105827e0,cad7a418425cf1e7e7f5455a0715d6e0e57a02f9..2b4355169bf1a2d6efef859c9c40fe2af45dc5c5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,102 +1,109 @@@
- protobuf (3.6.1.3-2+rpi1) buster-staging; urgency=medium
++protobuf (3.11.4-3+rpi1) bullseye-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 27 Apr 2019 13:37:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 27 Mar 2020 03:18:58 +0000
++
+ protobuf (3.11.4-3) unstable; urgency=medium
+ 
+   * Python3ify examples.
+ 
+  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Tue, 24 Mar 2020 18:20:00 +0000
+ 
+ protobuf (3.11.4-2) unstable; urgency=medium
+ 
+   * Upload to Sid (closes: #934665).
+ 
+   [ Jan Kriho <erbureth@gmail.com> ]
+   * Break different protobuf-compiler versions in libprotobuf-dev
+     (closes: #931836).
+ 
+  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Sat, 21 Mar 2020 13:44:22 +0000
+ 
+ protobuf (3.11.4-1) experimental; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Sun, 16 Feb 2020 07:39:54 +0000
+ 
+ protobuf (3.11.3-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Split protobuf-mode.el into a separate package (closes: #601600).
+   * Update debhelper level to 12 .
+   * Update Standards-Version to 4.5.0 .
+ 
+ 
+  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Thu, 06 Feb 2020 17:37:12 +0000
+ 
+ protobuf (3.11.2-1) experimental; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Fri, 20 Dec 2019 08:03:17 +0000
+ 
+ protobuf (3.11.1-1) experimental; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Fri, 06 Dec 2019 16:38:45 +0000
+ 
+ protobuf (3.11.0-1) experimental; urgency=medium
+ 
+   * New major upstream release.
+   * Library transition from libproto*21 to libproto*22 .
+ 
+  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Thu, 28 Nov 2019 16:30:21 +0000
+ 
+ protobuf (3.10.1-1) experimental; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Thu, 31 Oct 2019 14:14:51 +0000
+ 
+ protobuf (3.10.0-1) experimental; urgency=medium
+ 
+   * New major upstream release.
+   * Remove extra commas from Build-Depends{,-Indep} (closes: #935499).
+ 
+  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Tue, 08 Oct 2019 21:03:15 +0000
+ 
+ protobuf (3.10.0~rc1-2) experimental; urgency=medium
+ 
+   * Still fix FTBFS with self-test of Python 2 bindings.
+ 
+  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Thu, 12 Sep 2019 17:01:12 +0000
+ 
+ protobuf (3.10.0~rc1-1) experimental; urgency=medium
+ 
+   * New major upstream release candidate version.
+   * Library transition from libproto*20 to libproto*21 .
+   * Remove python-protobuf package (closes: #937327).
+   * Update Python packaging bits.
+   * Update copyright file.
+ 
+  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Mon, 09 Sep 2019 15:42:05 +0000
+ 
+ protobuf (3.9.1-2) experimental; urgency=medium
+ 
+   * Fix FTBFS with self-test of Python 2 bindings.
+ 
+  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Fri, 09 Aug 2019 14:13:49 +0000
+ 
+ protobuf (3.9.1-1) experimental; urgency=medium
+ 
+   * New major upstream release (closes: #933795).
+   * Update Java build.
+   * Make packages architecture: any again (closes: #923197).
+   * Library transition from libproto*17 to libproto*20 .
+   * Fix self-testing with Googletest <= 1.8.1 version.
+   * Update Standards-Version to 4.4.0 .
+ 
+   [ Laurence Parry <greenreaper@gmail.com> ]
+   * Fix FTBFS on x32 due to versioned glibc symbols (closes: #931503).
+ 
+  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Tue, 06 Aug 2019 16:36:47 +0000
  
  protobuf (3.6.1.3-2) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge