From 262d88c40b1113d0198c7fa686b0effcf8ba3d20 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sun, 21 Aug 2011 22:43:56 -0400 Subject: [PATCH] Make check-files aware of multiarch Signed-off-by: Anders Kaseorg --- check-files.mk | 8 +++++--- debian/changelog | 7 +++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/check-files.mk b/check-files.mk index 70a5820..d117c9a 100644 --- a/check-files.mk +++ b/check-files.mk @@ -61,19 +61,21 @@ $(call debian_check_files,%): $(call debian_check_files_tmp,%) $(call debian_check_files_tmp,%): target = $(call undebian_check_files_tmp,$@) $(call debian_check_files_tmp,%): name = $(call debian_check_files_check,$(target)) $(call debian_check_files_tmp,%): truename = $(shell /usr/sbin/dpkg-divert --truename $(name)) -$(call debian_check_files_tmp,%): package = $(shell dpkg -S $(name) | grep -v "^diversion by" | cut -f1 -d:) +$(call debian_check_files_tmp,%): package = $(shell dpkg -S $(name) | sed -n '/^diversion by /! s/: .*$$// p') $(call debian_check_files_tmp,%): $(truename) [ -n "$(package)" ] mkdir -p $(@D) cp "$(truename)" $@ set -e; \ + md5sums="$$(dpkg-query --control-path $(package) md5sums 2>/dev/null)" || \ + md5sums=/var/lib/dpkg/info/$(package).md5sums; \ md5=$$(dpkg-query --showformat='$${Conffiles}\n' --show $(package) | \ sed -n 's,^ $(name) \([0-9a-f]*\)$$,\1 $@, p'); \ if [ -n "$$md5" ]; then \ echo "$$md5" | md5sum -c; \ - elif [ -e /var/lib/dpkg/info/$(package).md5sums ]; then \ + elif [ -e "$$md5sums" ]; then \ md5=$$(sed -n 's,^\([0-9a-f]*\) $(patsubst /%,%,$(name))$$,\1 $@, p' \ - /var/lib/dpkg/info/$(package).md5sums); \ + "$$md5sums"); \ [ -n "$$md5" ] && echo "$$md5" | md5sum -c; \ else \ echo "config-package-dev: warning: $(package) does not include md5sums!"; \ diff --git a/debian/changelog b/debian/changelog index 8340428..60283e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +config-package-dev (4.13) UNRELEASED; urgency=low + + * Fix DEB_CHECK_FILES and DEB_TRANSFORM_FILES with non-conffiles in + Multi-Arch: same packages. + + -- Anders Kaseorg Sun, 21 Aug 2011 22:41:41 -0400 + config-package-dev (4.12) unstable; urgency=low [ Tim Abbott ] -- 2.44.0