On Fri, 20 Oct 2023 09:12:47 +0300
=?UTF-8?Q?Martin=2D=C3=89ric_Racine?= <martin-eric.rac...@iki.fi>
wrote:
> On Sun, 8 Oct 2023 14:13:46 +0200 Helmut Grohne <hel...@subdivi.de> wrote:
> > On Sun, Oct 08, 2023 at 01:42:05PM +0300, Martin-Éric Racine wrote:
> > > Thus changing fields from what to what?
> >
> > -Replaces: dhcpcd5 (<< 9.4.1-2)
> > -Breaks: dhcpcd5 (<< 9.4.1-2)
> > +Conflicts: dhcpcd5 (<< 9.4.1-2)
> >
> > The conflict implies a break and since it also prevents concurrent
> > unpack, no replacement can ever happen.
>
> Done for Sid (pending upload).
>
> For bookworm-pu, I'll have to check if there's any other fix I can
> cherry-pick from upstream, before I perform the upload and file the
> unblock request.
debdiff for bookworm-pu attached.
Martin-Éric
diff -Nru dhcpcd5-9.4.1/debian/changelog dhcpcd5-9.4.1/debian/changelog
--- dhcpcd5-9.4.1/debian/changelog 2023-07-22 17:56:49.000000000 +0300
+++ dhcpcd5-9.4.1/debian/changelog 2023-10-20 11:12:13.000000000 +0300
@@ -1,3 +1,10 @@
+dhcpcd5 (9.4.1-24~deb12u3) bookworm; urgency=medium
+
+ * Move Breaks/Replaces dhcpcd5 (<< 9.4.1-2) to Conflicts (Closes: #1053657).
+ * Update dhcpcd.preinst version check.
+
+ -- Martin-Éric Racine <martin-eric.rac...@iki.fi> Fri, 20 Oct 2023 11:12:13
+0300
+
dhcpcd5 (9.4.1-24~deb12u2) bookworm; urgency=medium
* Fixed dhcpcd.preinst with the tilde version.
diff -Nru dhcpcd5-9.4.1/debian/control dhcpcd5-9.4.1/debian/control
--- dhcpcd5-9.4.1/debian/control 2023-05-28 05:57:38.000000000 +0300
+++ dhcpcd5-9.4.1/debian/control 2023-10-20 11:11:34.000000000 +0300
@@ -14,8 +14,7 @@
Package: dhcpcd-base
Architecture: any
Provides: dhcp-client
-Replaces: dhcpcd5 (<< 9.4.1-2)
-Breaks: dhcpcd5 (<< 9.4.1-2)
+Conflicts: dhcpcd5 (<< 9.4.1-2)
Depends: adduser,
${misc:Depends},
${shlibs:Depends}
diff -Nru dhcpcd5-9.4.1/debian/dhcpcd.preinst
dhcpcd5-9.4.1/debian/dhcpcd.preinst
--- dhcpcd5-9.4.1/debian/dhcpcd.preinst 2023-07-22 17:56:40.000000000 +0300
+++ dhcpcd5-9.4.1/debian/dhcpcd.preinst 2023-10-20 11:12:08.000000000 +0300
@@ -2,7 +2,7 @@
# As per Debian bug #1037190.
# Copyright 2023 Andreas Beckmann <a...@debian.org>
set -e
-if dpkg --compare-versions "$2" lt-nl "1:9.4.1-24~deb12u2~" ; then
+if dpkg --compare-versions "$2" lt-nl "1:9.4.1-24~deb12u3~" ; then
# Cleanup leftovers from dhcpcd 1:3.* in Wheezy.
# Can be removed after Trixie is released.
update-alternatives --remove dhcpcd /sbin/dhcpcd3
