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=85aa070f774df38d1dcf0dc2d451bf6848eee1c6 commit 85aa070f774df38d1dcf0dc2d451bf6848eee1c6 Author: Guillem Jover <[email protected]> AuthorDate: Sat Aug 25 02:32:40 2018 +0200 build: Only sign the perl distribution if we are doing an actual release Forcing the signing while not actually preparing a tarball for a release disitribution, that is due to a signed tag, means that any random «make distcheck» will trigger an annoying gpg prompt. --- configure.ac | 2 ++ cpan.am | 2 +- m4/dpkg-build.m4 | 13 +++++++++++++ scripts/Build.PL.in | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index bdf05ffb4..121c7665a 100644 --- a/configure.ac +++ b/configure.ac @@ -5,12 +5,14 @@ m4_pattern_forbid([^_?DPKG_]) AC_PREREQ(2.60) AC_INIT([dpkg], m4_esyscmd([./get-version]), [[email protected]], [dpkg], [https://wiki.debian.org/Teams/Dpkg]) +DPKG_DIST_IS_RELEASE AC_SUBST([PACKAGE_COPYRIGHT_HOLDER], ['Dpkg Developers']) AC_SUBST([PACKAGE_VCS_TYPE], [git]) AC_SUBST([PACKAGE_VCS_URL], [https://git.dpkg.org/git/dpkg/dpkg.git]) AC_SUBST([PACKAGE_VCS_WEB], [https://git.dpkg.org/cgit/dpkg/dpkg.git]) AC_SUBST([PACKAGE_BUG_WEB], [https://bugs.debian.org/src:dpkg]) AC_SUBST([PACKAGE_CPAN_NAME], [Dpkg]) +AC_SUBST([PACKAGE_CPAN_SIGN], [$dpkg_dist_is_release]) AC_CONFIG_SRCDIR([lib/dpkg/dpkg.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/cpan.am b/cpan.am index 276fddc72..2ff9192ac 100644 --- a/cpan.am +++ b/cpan.am @@ -33,7 +33,7 @@ dist-cpan: : # Prepare the CPAN distribution. cd $(CPAN_DIST) && ./Build.PL cd $(CPAN_DIST) && ./Build manifest - cd $(CPAN_DIST) && ./Build distsign + cd $(CPAN_DIST) && ./Build distdir : # Pack the CPAN distribution. $(TAR) -caf $(CPAN_DIST_ARCHIVE) -C $(CPAN_DIST) -Hustar \ diff --git a/m4/dpkg-build.m4 b/m4/dpkg-build.m4 index 1ea3e4b22..5b98849c3 100644 --- a/m4/dpkg-build.m4 +++ b/m4/dpkg-build.m4 @@ -84,6 +84,19 @@ AC_DEFUN([DPKG_DEB_COMPRESSOR], [ [default dpkg-deb build compressor]) ]) # DPKG_DEB_COMPRESSOR +# DPKG_DIST_IS_RELEASE() +# -------------------- +# Check whether we are preparing a distribution tarball for a release. +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], [ + dpkg_dist_is_release=1 + ], [ + dpkg_dist_is_release=0 + ]) + unset dpkg_dist_version +])# DPKG_DIST_IS_RELEASE + # DPKG_DIST_CHECK(COND, ERROR) # --------------- # Check if the condition is fulfilled when preparing a distribution tarball. diff --git a/scripts/Build.PL.in b/scripts/Build.PL.in index 2f81260bd..198c53780 100644 --- a/scripts/Build.PL.in +++ b/scripts/Build.PL.in @@ -50,7 +50,7 @@ my $build = $class->new( keywords => [ qw(dpkg debian perl) ], }, - sign => 1, + sign => @PACKAGE_CPAN_SIGN@, dynamic_config => 0, configure_requires => { -- Dpkg.Org's dpkg
