[27587] in Source-Commits
config-package-dev commit: Sync 5.1.2 from Debian unstable
daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Tue Feb 4 01:30:33 2014
Date: Tue, 4 Feb 2014 01:30:23 -0500
From: Anders Kaseorg <andersk@MIT.EDU>
Message-Id: <201402040630.s146UNsN013396@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/config-package-dev/commit/bd3f0fb0704fcd289b9e26be6f61f45446379529
commit bd3f0fb0704fcd289b9e26be6f61f45446379529
Author: Anders Kaseorg <andersk@mit.edu>
Date: Tue Feb 4 01:29:05 2014 -0500
Sync 5.1.2 from Debian unstable
* Don't hardcode dpkg-divert's path in check-files.mk (Debathena: #1358)
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
check-files.mk | 2 +-
debian/changelog | 7 +++++++
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/check-files.mk b/check-files.mk
index f837c61..8ee47fb 100644
--- a/check-files.mk
+++ b/check-files.mk
@@ -59,7 +59,7 @@ $(call debian_check_files,%): $(call debian_check_files_tmp,%)
# There is some wrangling here because the formats of these sources differ.
$(call debian_check_files_tmp,%): target = $(call undebian_check_files_tmp,$@)
$(call debian_check_files_tmp,%): name = $(call debian_check_files_source,$(target))
-$(call debian_check_files_tmp,%): truename = $(shell /usr/sbin/dpkg-divert --truename $(name))
+$(call debian_check_files_tmp,%): truename = $(shell dpkg-divert --truename $(name))
$(call debian_check_files_tmp,%): package = $(shell LC_ALL=C dpkg -S $(name) | sed -n '/^diversion by /! s/: .*$$// p')
$(call debian_check_files_tmp,%): $(truename)
[ -n "$(package)" ]
diff --git a/debian/changelog b/debian/changelog
index aaea911..16cde6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+config-package-dev (5.1.2) unstable; urgency=low
+
+ * Team upload.
+ * Don't hardcode dpkg-divert's path in check-files.mk (Debathena: #1358)
+
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 22 May 2013 08:27:04 -0400
+
config-package-dev (5.1.1) unstable; urgency=low
* Team upload.
