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=c4e8529c7dd3c5ead87b8e8c5a6e5c83093c72de commit c4e8529c7dd3c5ead87b8e8c5a6e5c83093c72de Author: Guillem Jover <[email protected]> AuthorDate: Wed Feb 20 11:48:08 2019 +0100 build: Check whether this dist is a release based only on the version format Using the .dist-version file implies that we need to do a two staged release process. First a «make dist», unpack the generated tarball distribution, and run that again. When the deciding factor is the format of the version. Switch to use that exclusively. --- debian/changelog | 6 ++++++ m4/dpkg-build.m4 | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e9aa8c06f..a92764c3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,11 @@ dpkg (1.19.5) UNRELEASED; urgency=medium + [ Guillem Jover ] + * Build system: + - Check whether this dist is a release, based only on the version format. + This will avoid having to do a two staged release to get a proper perl + distribution tarball. + [ Updated programs translations ] * German (Sven Joachim). diff --git a/m4/dpkg-build.m4 b/m4/dpkg-build.m4 index bd8a2e68f..d73db9907 100644 --- a/m4/dpkg-build.m4 +++ b/m4/dpkg-build.m4 @@ -89,13 +89,11 @@ AC_DEFUN([DPKG_DEB_COMPRESSOR], [ # Check whether we are preparing a distribution tarball for a release, and # set PACKAGE_DIST_IS_RELEASE accordingly. AC_DEFUN([DPKG_DIST_IS_RELEASE], [ - dpkg_dist_version=$srcdir/.dist-version - AS_IF([test -f $dpkg_dist_version && grep -q -v '[-]' $dpkg_dist_version], [ + AS_IF([echo $PACKAGE_VERSION | grep -q -v '[-]'], [ dpkg_dist_is_release=1 ], [ dpkg_dist_is_release=0 ]) - unset dpkg_dist_version AM_CONDITIONAL([PACKAGE_DIST_IS_RELEASE], [test "$dpkg_dist_is_release" -eq 1]) AC_SUBST([PACKAGE_DIST_IS_RELEASE], [$dpkg_dist_is_release]) -- Dpkg.Org's dpkg
