From: Eric Ball <eball@linuxfoundation.org>
Date: Thu, 26 Jun 2025 17:47:02 +0000 (-0700)
Subject: Chore: Update debhelper package for newer Ubuntu
X-Git-Tag: v0.16.9^0
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F03%2F73503%2F1;p=releng%2Fcommon-packer.git

Chore: Update debhelper package for newer Ubuntu

dh-systemd is an outdated package, and has been replaced by debhelper.
debhelper is available on all newer distros, so it is safe to switch
to having that package as the default, and only install dh-systemd on
the oldest support Ubuntu version.

Change-Id: Ib9f9a22a7b0ed8080ca22a90041e16227140c23b
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
---

diff --git a/provision/install-base-pkgs-Ubuntu-22.04.yaml b/provision/install-base-pkgs-Ubuntu-18.04.yaml
similarity index 90%
rename from provision/install-base-pkgs-Ubuntu-22.04.yaml
rename to provision/install-base-pkgs-Ubuntu-18.04.yaml
index be1b589..52587db 100644
--- a/provision/install-base-pkgs-Ubuntu-22.04.yaml
+++ b/provision/install-base-pkgs-Ubuntu-18.04.yaml
@@ -4,6 +4,7 @@
     name:
       - build-essential
       - devscripts
+      - dh-systemd
       - equivs
       - gdebi
     state: latest
diff --git a/provision/install-base-pkgs-Ubuntu.yaml b/provision/install-base-pkgs-Ubuntu.yaml
index 52587db..ad7b42e 100644
--- a/provision/install-base-pkgs-Ubuntu.yaml
+++ b/provision/install-base-pkgs-Ubuntu.yaml
@@ -3,8 +3,8 @@
   ansible.builtin.apt:
     name:
       - build-essential
+      - debhelper
       - devscripts
-      - dh-systemd
       - equivs
       - gdebi
     state: latest