Skip to content

Commit 3379330

Browse files
committed
Don't harcode dpkg-divert (Trac: #1358)
1 parent 79a3018 commit 3379330

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

check-files.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ $(call debian_check_files,%): $(call debian_check_files_tmp,%)
5959
# There is some wrangling here because the formats of these sources differ.
6060
$(call debian_check_files_tmp,%): target = $(call undebian_check_files_tmp,$@)
6161
$(call debian_check_files_tmp,%): name = $(call debian_check_files_source,$(target))
62-
$(call debian_check_files_tmp,%): truename = $(shell /usr/sbin/dpkg-divert --truename $(name))
62+
$(call debian_check_files_tmp,%): truename = $(shell dpkg-divert --truename $(name))
6363
$(call debian_check_files_tmp,%): package = $(shell LC_ALL=C dpkg -S $(name) | sed -n '/^diversion by /! s/: .*$$// p')
6464
$(call debian_check_files_tmp,%): $(truename)
6565
[ -n "$(package)" ]

debian/changelog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
config-package-dev (5.1.2) unstable; urgency=low
2+
3+
* Team upload.
4+
* Don't hardcode dpkg-divert's path in check-files.mk (Debathena: #1358)
5+
6+
-- Jonathan Reed <jdreed@mit.edu> Wed, 22 May 2013 08:27:04 -0400
7+
18
config-package-dev (5.1.1) unstable; urgency=low
29

310
* Team upload.

0 commit comments

Comments
 (0)