Merge ~paelzer/ubuntu/+source/xdp-tools:merge-noble into ubuntu/+source/xdp-tools:debian/sid

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/noble-xdp-tools

This has become a trivial merge with only the dependencies as delta.

We could one day make this use a template generated at build time and make it a sync.
But for now just a merge with little delta left to ensure noble is up to date.

[Frode Nordahl (fnordahl)]

LGTM, thanks for raising this!

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks for the pair of eyes, uploaded

[Utkarsh Gupta (utkarsh)]

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: paelzer, utkarsh
Uploaders: paelzer, utkarsh
MP auto-approved

review: Approve

[Christian Ehrhardt  (paelzer)]

And the PPA had all default arches, but not risc as we need to enable it manually.
Guess what failed ...

diff --git a/debian/changelog b/debian/changelog
index cc3c83f..7c7bf0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xdp-tools (1.4.2-1ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/control: Change build dep for bpftool on Ubuntu
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 14 Feb 2024 16:59:02 +0100
+
 xdp-tools (1.4.2-1) unstable; urgency=medium
 
   * Update upstream source from tag 'upstream/1.4.2'
@@ -31,6 +38,21 @@ xdp-tools (1.3.0-3~exp1) experimental; urgency=medium
 
  -- Luca Boccassi <[e-mail]>  Tue, 21 Feb 2023 15:58:46 +0000
 
+xdp-tools (1.3.0-2ubuntu2) lunar; urgency=medium
+
+  * d/p/lp-2008214-ppc64le-build-failure.patch: Resolve FTBFS for ppc64le on
+    Ubuntu (LP: #2008214).
+
+ -- Frode Nordahl <[e-mail]>  Thu, 23 Feb 2023 14:02:56 +0100
+
+xdp-tools (1.3.0-2ubuntu1) lunar; urgency=medium
+
+  * Resolve FTBFS on Ubuntu (LP: #2007308):
+    - d/control: Change build dep for bpftool on Ubuntu.
+    - d/rules: Conditionally set BPFTOOL variable for build on Ubuntu.
+
+ -- Frode Nordahl <[e-mail]>  Wed, 22 Feb 2023 15:12:51 +0000
+
 xdp-tools (1.3.0-2) unstable; urgency=medium
 
   * Add patch to fix build on arm/mips
diff --git a/debian/control b/debian/control
index a4aa346..8cc6be7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,16 @@
 Source: xdp-tools
 Section: devel
 Priority: optional
-Maintainer: Luca Boccassi <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Luca Boccassi <[e-mail]>
 Rules-Requires-Root: no
-Build-Depends: bpftool,
-               clang,
+Build-Depends: clang,
                debhelper-compat (= 13),
                dh-package-notes,
                libbpf-dev,
                libelf-dev,
                libpcap-dev,
+               linux-tools-generic,
                llvm,
                pkg-config,
                zlib1g-dev,