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=14bf41d1c108faf3407037a332bc35f4cafc6270 commit 14bf41d1c108faf3407037a332bc35f4cafc6270 Author: Guillem Jover <[email protected]> AuthorDate: Mon Jun 22 05:20:44 2020 +0200 build: Fix shell files substitution for version variable Variables in shell scripts do not accept spaces around the equal sign. Adjust the regex to not match such incorrect variable syntax. --- debian/changelog | 1 + scripts/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5d0ba4859..4d19bf7b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -106,6 +106,7 @@ dpkg (1.20.1) UNRELEASED; urgency=medium - Update false positive suppressions for cppcheck 2.1. - Install specifications and API contracts in docdir. - Add support for switching man pages from roff to POD format. + - Fix shell files substitution for version variable. * Packaging: - Switch to debhelper compatibility level 13. - Remove debian/tmp prefix from manpages debhelper fragment files. diff --git a/scripts/Makefile.am b/scripts/Makefile.am index d36dbd1eb..d7b7d856e 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -147,7 +147,7 @@ do_perl_subst = $(AM_V_GEN) sed \ -e "s:our \$$PROGVERSION = .*;:our \$$PROGVERSION = '$(PACKAGE_VERSION)';:" do_shell_subst = $(AM_V_GEN) sed \ - -e "s:^version[[:space:]]*=[[:space:]]*['\"][^'\"]*[\"']:version=\"$(PACKAGE_VERSION)\":" + -e "s:^version=['\"][^'\"]*[\"']:version=\"$(PACKAGE_VERSION)\":" SUFFIXES = .pl .sh -- Dpkg.Org's dpkg
