Control: tags -1 + patch

Hi Mario

On Tue, 18 Mar 2025 18:20:13 +0800 Sean Whitton <spwhit...@spwhitton.name> wrote:
Package: fwupd
Version: 2.0.6-4

Dear maintainer,

The upgrade from bookworm to trixie left behind multiple obsolete
conffiles on my system:

  fwupd /etc/fwupd/uefi_capsule.conf
  fwupd /etc/fwupd/thunderbolt.conf
  fwupd /etc/fwupd/remotes.d/vendor.conf
  fwupd /etc/fwupd/redfish.conf
  fwupd /etc/fwupd/msr.conf
  fwupd /etc/fwupd/daemon.conf

See the reference to dpkg-maintscript-helper in dh_installdeb(1) for how
to fix this.
Attached is a patch which deals with this issue.
Mario, it would be great if you can review this patch and make another upload in time for trixie.

While looking at it, I noticed that the existing maintscript entries did not use proper version information so the conffile removal was skipped in quite a few cases, such as
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=980570
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1005417

prior-version should not be the last upstream version shipping this configuration file, but the last debian version which did not have the cleanup routine.

In this case, it is 2.0.6-4. But since there can be binNMU, it's safer to use version_to_be_uploaded~ , which is what I picked here: 2.0.6-5~

I've bumped all existing entries to this version so the cleanup routine is run again (once) (and sorted the entries to make the list more readable).

Regards,
Michael
diff -Nru fwupd-2.0.6/debian/changelog fwupd-2.0.6/debian/changelog
--- fwupd-2.0.6/debian/changelog        2025-03-08 06:16:32.000000000 +0100
+++ fwupd-2.0.6/debian/changelog        2025-03-18 16:39:06.000000000 +0100
@@ -1,3 +1,13 @@
+fwupd (2.0.6-5) UNRELEASED; urgency=medium
+
+  * Remove obsolete conffiles on upgrade (Closes: #1064877, #1100757)
+  * Bump versions of existing rm_conffile entries.
+    Most of the existing entries did not have a correct version so the removal
+    was skipped unintentionally in certain cases. Bump those versions to
+    attempt another cleanup. (Closes: #980570, #1005417)
+
+ -- Michael Biebl <bi...@debian.org>  Tue, 18 Mar 2025 16:39:06 +0100
+
 fwupd (2.0.6-4) unstable; urgency=medium
 
   [ Michael Biebl ]
diff -Nru fwupd-2.0.6/debian/fwupd.maintscript 
fwupd-2.0.6/debian/fwupd.maintscript
--- fwupd-2.0.6/debian/fwupd.maintscript        2025-03-08 06:16:21.000000000 
+0100
+++ fwupd-2.0.6/debian/fwupd.maintscript        2025-03-18 16:39:06.000000000 
+0100
@@ -1,11 +1,16 @@
-
-rm_conffile /etc/fwupd.conf 1.0.0~
-rm_conffile /etc/fwupd/remotes.d/fwupd.conf 1.2.7~
-rm_conffile /etc/dbus-1/system.d/org.freedesktop.fwupd.conf 1.3.2~
-rm_conffile /etc/modules-load.d/fwupd-msr.conf 1.5.3~
-rm_conffile /etc/modules-load.d/fwupd-platform-integrity.conf 1.5.3~
-rm_conffile /etc/fwupd/ata.conf 1.5.5~
-mv_conffile /etc/fwupd/uefi.conf /etc/fwupd/uefi_capsule.conf 1.5.5~
-rm_conffile /etc/pki/fwupd/GPG-KEY-Hughski-Limited 1.9.10~
-rm_conffile /etc/fwupd/upower.conf 1.9.10~
-rm_conffile /etc/fwupd/remotes.d/dell-esrt.conf 1.9.11~
+rm_conffile /etc/dbus-1/system.d/org.freedesktop.fwupd.conf 2.0.6-5~
+rm_conffile /etc/fwupd/ata.conf 2.0.6-5~
+rm_conffile /etc/fwupd.conf 2.0.6-5~
+rm_conffile /etc/fwupd/daemon.conf 2.0.6-5~
+rm_conffile /etc/fwupd/msr.conf 2.0.6-5~
+rm_conffile /etc/fwupd/redfish.conf 2.0.6-5~
+rm_conffile /etc/fwupd/remotes.d/dell-esrt.conf 2.0.6-5~
+rm_conffile /etc/fwupd/remotes.d/fwupd.conf 2.0.6-5~
+rm_conffile /etc/fwupd/remotes.d/vendor.conf 2.0.6-5~
+rm_conffile /etc/fwupd/thunderbolt.conf 2.0.6-5~
+rm_conffile /etc/fwupd/uefi_capsule.conf 2.0.6-5~
+rm conffile /etc/fwupd/uefi.conf 2.0.6-5~
+rm_conffile /etc/fwupd/upower.conf 2.0.6-5~
+rm_conffile /etc/modules-load.d/fwupd-msr.conf 2.0.6-5~
+rm_conffile /etc/modules-load.d/fwupd-platform-integrity.conf 2.0.6-5~
+rm_conffile /etc/pki/fwupd/GPG-KEY-Hughski-Limited 2.0.6-5~

Attachment: OpenPGP_signature.asc
Description: OpenPGP digital signature

Reply via email to