From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 22 Jan 2021 12:08:46 +0000 (+0000)
Subject: Merge version 0.3-1+rpi1 and 0.3-2 to produce 0.3-2+rpi1
X-Git-Tag: archive/raspbian/0.3-2+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5b92ad7d13233962a67d65482f94f28c3e3315a5;p=libbpf.git

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

517d56fe00a25312438f89b2b7bc7c4d19121109
diff --cc debian/changelog
index cb1a1d0,45b72c3..738eae2
--- a/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