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

diff --cc debian/changelog
index cb1a1d01a923e864398a66e3ca90f365fd3729b8,45b72c392a668dd9fd2940bc336bf87ad142b54a..738eae2682434a4ec00649d151018725a9f1028a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,12 +1,19 @@@
- libbpf (0.3-1+rpi1) bullseye-staging; urgency=medium
++libbpf (0.3-2+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 0.3-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 07 Jan 2021 03:30:15 +0000]
 +  * Disable use of dmb on arm, it's not approprpriate for raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 07 Jan 2021 03:30:15 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 22 Jan 2021 12:08:45 +0000
++
+ libbpf (0.3-2) unstable; urgency=medium
+ 
+   [ Luca Boccassi ]
+   * Add build-dependency on zlib1g-dev
+   * Use pkg-config to get build flags
+   * Enable verbose builds unless 'terse' DEB_BUILD_OPTIONS is set
+   * Have libbpf-dev depend on libelf-dev and zlib1g-dev
+ 
+  -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Sun, 10 Jan 2021 17:43:30 +0000
  
  libbpf (0.3-1) unstable; urgency=medium