This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=37dd4ce62e0925967c59daec130540d2fa0402d6 commit 37dd4ce62e0925967c59daec130540d2fa0402d6 Author: Colin Watson <cjwat...@debian.org> AuthorDate: Fri Nov 16 04:15:13 2018 +0100 scripts/mk: Fix dpkg_vendor_derives_from macro documentation Add a missing comma, and $(shell) make function invocation. Closes: #913816 Signed-off-by: Guillem Jover <guil...@debian.org> --- debian/changelog | 2 ++ scripts/mk/vendor.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4429ccc68..4a4446434 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ dpkg (1.19.3) UNRELEASED; urgency=medium * update-alternatives: Add new --debug option. * update-alternatives: Fix removal of obsolete slaves from the linked list. Reported by Andreas Beckmann <a...@debian.org>. Closes: #916799 + * vendor.mk: Fix dpkg_vendor_derives_from macro documentation. + Thanks to Colin Watson <cjwat...@debian.org>. Closes: #913816 * Perl modules: - Dpkg::Changelog::Debian: Preserve modelines at EOF. Closes: #916056 Thanks to Chris Lamb <la...@debian.org> for initial test cases. diff --git a/scripts/mk/vendor.mk b/scripts/mk/vendor.mk index aa75cd6fc..fe06828f5 100644 --- a/scripts/mk/vendor.mk +++ b/scripts/mk/vendor.mk @@ -6,7 +6,7 @@ # The snippet also defines a macro "dpkg_vendor_derives_from" that you can # use to verify if the current vendor derives from another vendor with a # simple test like this one: -# ifeq ($(call dpkg_vendor_derives_from ubuntu),yes) +# ifeq ($(shell $(call dpkg_vendor_derives_from,ubuntu)),yes) # ... # endif -- Dpkg.Org's dpkg
