On Fri, Jun 23, 2023 at 5:43 PM Andreas Beckmann <a...@debian.org> wrote: > > On 22/06/2023 12.15, Martin-Éric Racine wrote: > >>> To solve that, we need to add Conflicts: dhcpcd (<< 1:5~) to usrmerge > >>> which will make dhcpcd in sid (and bookworm) uninstallable due to the > >>> missing epoch. > >> > >> Ack. > >> > >> Currently in NEW. > > That probably won't work and will cause a reject, since it drops the > epoch from a source package that previously (up to wheezy) had an epoch.
No, it re-introduces the epoch. > I've tested adding the epoch to the bookworm package in my piuparts > framework, and that seems to make the upgrades succeed if the package > version from wheezy is still installed. > > Please also add this dhcpcd.preinst script to clean up leftovers from > the wheezy package. > > ===== >8 ===== > #!/bin/sh > set -e > > if dpkg --compare-versions "$2" lt-nl "1:10.0.1-2~" ; then > # cleanup leftovers from dhcpcd 1:3.* in wheezy > # can be removed after the release of trixie > update-alternatives --remove dhcpcd /sbin/dhcpcd3 > if [ -d /etc/dhcpc ]; then > test ! -h /etc/dhcpc/resolv.conf || rm -fv > /etc/dhcpc/resolv.conf > rmdir --ignore-fail-on-non-empty /etc/dhcpc > fi > fi > > #DEBHELPER# > ===== 8< ===== > (the version "1:10.0.1-2~" assumes the preinst gets added in the > 1:10.0.1-2 upload) Is /etc/dhcpc the correct path or should it be /etc/dhcpcd instead? Shouldn't we instead try to move that resolv.conf instead of deleting it? > > Btw, if you think that this or anything else is worthy of a > > cherry-pick for bookworm-updates, suggestions are welcome. > > The re-addition of the epoch definitively needs to backported to > bookworm-pu, otherwise the upcoming usrmerge upload (with additional > Breaks) to bookworm-pu will make dhcpcd uninstallable. Noted. > The preinst is needed as well (but with a version of > "1:9.4.1-22+deb12u1~" in the test) as the leftover alternative seems to > be the source of the usrmerge conflict noticed in wicd-daemon. I vaguely recall something in Scott's old maintainer files adding/removing a symbolic link. That's probably what causes this. > (The bookworm-pu upload needs to use the old source package name dhcpcd5 > (and version 9.4.1-22+deb12u1), but you can update the Vcs-* URLs if you > want to put the bookworm branch in the "new" repository location.) Indeed. Martin-Éric
