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=52166568df4f736b1f2594d6fc209c70c0052630 commit 52166568df4f736b1f2594d6fc209c70c0052630 Author: Guillem Jover <guil...@debian.org> AuthorDate: Sun Apr 19 22:37:53 2020 +0200 scripts/mk: Unify and cleanup Makefile fragment files comments Include information about version of introduction. --- debian/changelog | 2 ++ scripts/mk/architecture.mk | 6 +++--- scripts/mk/buildflags.mk | 20 ++++++++++---------- scripts/mk/buildtools.mk | 39 ++++++++++++++++++++------------------- scripts/mk/default.mk | 4 ++-- scripts/mk/pkg-info.mk | 21 ++++++++++++--------- scripts/mk/vendor.mk | 9 +++++---- 7 files changed, 54 insertions(+), 47 deletions(-) diff --git a/debian/changelog b/debian/changelog index 18c494ed9..a89a4ea36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ dpkg (1.20.1) UNRELEASED; urgency=medium to avoid printing garbage. - libdpkg: Open the log file as write-only instead of read-only. Thanks to Roderich Schupp <roderich.sch...@gmail.com>. Closes: #953684 + * Unify and cleanup Makefile fragment files comments, including information + about version of introduction. * Perl modules: - Dpkg: Add a LICENSE section to the POD. - Dpkg::Source::Package: Add new get_upstream_signing_key() method. diff --git a/scripts/mk/architecture.mk b/scripts/mk/architecture.mk index 0af96019d..2aa115822 100644 --- a/scripts/mk/architecture.mk +++ b/scripts/mk/architecture.mk @@ -1,6 +1,6 @@ -# This Makefile snippet defines all the DEB_HOST_* / DEB_BUILD_* variables -# that dpkg-architecture can return. Existing values of those variables -# are preserved as per policy. +# This Makefile frament (since dpkg 1.16.1) defines all the DEB_HOST_* and +# DEB_BUILD_* variables that dpkg-architecture can return. Existing values +# of those variables are preserved as per policy. dpkg_lazy_eval ?= $$(or $$(value DPKG_CACHE_$(1)),$$(eval DPKG_CACHE_$(1) := $$(shell $(2)))$$(value DPKG_CACHE_$(1))) diff --git a/scripts/mk/buildflags.mk b/scripts/mk/buildflags.mk index bb496e108..a39ee4760 100644 --- a/scripts/mk/buildflags.mk +++ b/scripts/mk/buildflags.mk @@ -1,14 +1,14 @@ -# This Makefile snippet defines the following variables: +# This Makefile fragment (since dpkg 1.16.1) defines the following variables: # -# CFLAGS: flags for the C compiler -# CPPFLAGS: flags for the C preprocessor -# CXXFLAGS: flags for the C++ compiler -# OBJCFLAGS: flags for the Objective C compiler -# OBJCXXFLAGS: flags for the Objective C++ compiler -# GCJFLAGS: flags for the GNU Java compiler -# FFLAGS: flags for the Fortran 77 compiler -# FCFLAGS: flags for the Fortran 9x compiler -# LDFLAGS: flags for the linker +# CFLAGS: flags for the C compiler. +# CPPFLAGS: flags for the C preprocessor. +# CXXFLAGS: flags for the C++ compiler. +# OBJCFLAGS: flags for the Objective C compiler. +# OBJCXXFLAGS: flags for the Objective C++ compiler. +# GCJFLAGS: flags for the GNU Java compiler. +# FFLAGS: flags for the Fortran 77 compiler. +# FCFLAGS: flags for the Fortran 9x compiler. +# LDFLAGS: flags for the linker. # # You can also export them in the environment by setting # DPKG_EXPORT_BUILDFLAGS to a non-empty value. diff --git a/scripts/mk/buildtools.mk b/scripts/mk/buildtools.mk index fcbfc2738..b2ab2a2ac 100644 --- a/scripts/mk/buildtools.mk +++ b/scripts/mk/buildtools.mk @@ -1,23 +1,24 @@ -# This Makefile snippet defines the following variables for host tools: +# This Makefile fragment (since dpkg 1.19.0) defines the following variables +# for host tools: # -# AS: assembler -# CPP: C preprocessor -# CC: C compiler -# CXX: C++ compiler -# OBJC: Objective C compiler -# OBJCXX: Objective C++ compiler -# GCJ: GNU Java compiler -# F77: Fortran 77 compiler -# FC: Fortran 9x compiler -# LD: linker -# STRIP: strip objects -# OBJCOPY: copy objects -# OBJDUMP: dump objects -# NM: names lister -# AR: archiver -# RANLIB: archive index generator -# PKG_CONFIG: pkg-config tool -# QMAKE: Qt build system generator +# AS: assembler (since dpkg 1.19.1). +# CPP: C preprocessor. +# CC: C compiler. +# CXX: C++ compiler. +# OBJC: Objective C compiler. +# OBJCXX: Objective C++ compiler. +# GCJ: GNU Java compiler. +# F77: Fortran 77 compiler. +# FC: Fortran 9x compiler. +# LD: linker. +# STRIP: strip objects (since dpkg 1.19.1). +# OBJCOPY: copy objects (since dpkg 1.19.1). +# OBJDUMP: dump objects (since dpkg 1.19.1). +# NM: names lister (since dpkg 1.19.1). +# AR: archiver (since dpkg 1.19.1). +# RANLIB: archive index generator (since dpkg 1.19.1). +# PKG_CONFIG: pkg-config tool. +# QMAKE: Qt build system generator (since dpkg 1.20.0). # # All the above variables have a counterpart variable for the build tool, # as in CC → CC_FOR_BUILD. diff --git a/scripts/mk/default.mk b/scripts/mk/default.mk index c17235401..7df11cd55 100644 --- a/scripts/mk/default.mk +++ b/scripts/mk/default.mk @@ -1,5 +1,5 @@ -# Include all the Makefiles that define variables that can be useful -# within debian/rules +# This Makefile fragment (since dpkg 1.16.1) includes all the Makefile +# fragments that define variables that can be useful within debian/rules. dpkg_datadir = $(srcdir)/mk include $(dpkg_datadir)/architecture.mk diff --git a/scripts/mk/pkg-info.mk b/scripts/mk/pkg-info.mk index 15322cedd..bccde2317 100644 --- a/scripts/mk/pkg-info.mk +++ b/scripts/mk/pkg-info.mk @@ -1,14 +1,17 @@ -# Makefile snippet defining the following variables: +# This Makefile fragment (since dpkg 1.16.1) defines the following package +# information variables: # -# DEB_SOURCE: the source package name -# DEB_VERSION: the full version of the package (epoch + upstream vers. + revision) -# DEB_VERSION_EPOCH_UPSTREAM: the package's version without the Debian revision -# DEB_VERSION_UPSTREAM_REVISION: the package's version without the Debian epoch -# DEB_VERSION_UPSTREAM: the package's upstream version -# DEB_DISTRIBUTION: the distribution(s) listed in the current entry of debian/changelog +# DEB_SOURCE: source package name. +# DEB_VERSION: package's full version (epoch + upstream vers. + revision). +# DEB_VERSION_EPOCH_UPSTREAM: package's version without the Debian revision. +# DEB_VERSION_UPSTREAM_REVISION: package's version without the Debian epoch. +# DEB_VERSION_UPSTREAM: package's upstream version. +# DEB_DISTRIBUTION: distribution(s) listed in the current debian/changelog +# entry. # -# SOURCE_DATE_EPOCH: the source release date as seconds since the epoch, as -# specified by <https://reproducible-builds.org/specs/source-date-epoch/> +# SOURCE_DATE_EPOCH: source release date as seconds since the epoch, as +# specified by <https://reproducible-builds.org/specs/source-date-epoch/> +# (since dpkg 1.18.8). dpkg_late_eval ?= $(or $(value DPKG_CACHE_$(1)),$(eval DPKG_CACHE_$(1) := $(shell $(2)))$(value DPKG_CACHE_$(1))) diff --git a/scripts/mk/vendor.mk b/scripts/mk/vendor.mk index f3b1565bb..f7c61bf6f 100644 --- a/scripts/mk/vendor.mk +++ b/scripts/mk/vendor.mk @@ -1,9 +1,10 @@ -# Makefile snippet defining the following vendor-related variables: +# This Makefile fragment (since dpkg 1.16.1) defines the following +# vendor-related variables: # -# DEB_VENDOR: output of dpkg-vendor --query Vendor -# DEB_PARENT_VENDOR: output of dpkg-vendor --query Parent (can be empty) +# DEB_VENDOR: output of «dpkg-vendor --query Vendor». +# DEB_PARENT_VENDOR: output of «dpkg-vendor --query Parent» (can be empty). # -# This Makefile snippet also defines a set "dpkg_vendor_derives_from" +# This Makefile fragment also defines a set of "dpkg_vendor_derives_from" # macros that can be used to verify if the current vendor derives from # another vendor. The unversioned variant defaults to the v0 version if # undefined, which can be defined explicitly to one of the versions or the -- Dpkg.Org's dpkg
