This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=49b3219281350fe8db799541456a5917094367c3 commit 49b3219281350fe8db799541456a5917094367c3 (HEAD -> main) Author: Guillem Jover <[email protected]> AuthorDate: Fri Jan 19 05:08:22 2024 +0100 debian: Do not install dpkg-fsys-usrunmess on Debian and Ubuntu These distributions are now fully moving all pathnames in the shipped .deb packages under /usr and do not support any other filesystem layout. We keep shipping it for any derivative that has not opted-out. Ideally we'd do this by leaving the entries in the debhelper fragment files and then excluding them with -X when necessary, but that is not supported by dh_installman, so we do the next available thing, which is not great, but works. --- debian/dpkg.install | 1 - debian/dpkg.manpages | 1 - debian/rules | 25 +++++++++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/debian/dpkg.install b/debian/dpkg.install index 0063a81fb..3e8fc9fc5 100644 --- a/debian/dpkg.install +++ b/debian/dpkg.install @@ -14,7 +14,6 @@ usr/bin/dpkg-trigger usr/bin/update-alternatives usr/lib/dpkg/dpkg-db-backup usr/libexec/dpkg/ usr/lib/dpkg/dpkg-db-keeper usr/libexec/dpkg/ -usr/sbin/dpkg-fsys-usrunmess usr/sbin/start-stop-daemon usr/share/dpkg/*table usr/share/dpkg/sh/dpkg-error.sh diff --git a/debian/dpkg.manpages b/debian/dpkg.manpages index 8bb8b63a7..36da4b6e0 100644 --- a/debian/dpkg.manpages +++ b/debian/dpkg.manpages @@ -1,6 +1,5 @@ usr/share/man/{*,*/*}/dpkg-deb.1 usr/share/man/{*,*/*}/dpkg-divert.1 -usr/share/man/{*,*/*}/dpkg-fsys-usrunmess.8 usr/share/man/{*,*/*}/dpkg-maintscript-helper.1 usr/share/man/{*,*/*}/dpkg-query.1 usr/share/man/{*,*/*}/dpkg-realpath.1 diff --git a/debian/rules b/debian/rules index 5a391f5cd..f4b923542 100755 --- a/debian/rules +++ b/debian/rules @@ -38,6 +38,11 @@ endif testflags = TESTSUITEFLAGS=$(TESTSUITEFLAGS) TEST_PARALLEL=$(NUMJOBS) +dpkg_vendor = \ + $(CURDIR)/build-aux/run-script scripts/dpkg-vendor.pl + +DEB_VENDOR = $(shell $(call dpkg_vendor) --query Vendor) + D := $(CURDIR)/debian/tmp %: @@ -83,3 +88,23 @@ override_dh_bugfiles: override_dh_compress: dh_compress -Xspec/ + +ifeq (,$(filter $(DEB_VENDOR),Debian Ubuntu)) +execute_after_dh_install: + dh_install -pdpkg usr/sbin/dpkg-fsys-usrunmess + +# XXX: We cannot use -X, see debhelper #756366. +execute_after_dh_installman: + dh_installman -pdpkg $(wildcard \ + $(D)/usr/share/man/*/dpkg-fsys-usrunmess.8 \ + $(D)/usr/share/man/*/*/dpkg-fsys-usrunmess.8 \ + ) + +# XXX: We cannot pass pathnames to dh_installman w/o $(D), and then dh_missing +# complains that the pathnames do not match, so ignore them. +override_dh_missing: + dh_missing -Xdpkg-fsys-usrunmess.8 +else +override_dh_missing: + dh_missing -Xdpkg-fsys-usrunmess +endif -- Dpkg.Org's dpkg
