This is an automated email from the git hooks/post-receive script.

guillem pushed a commit to branch main
in repository dpkg.

View the commit online:
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=3ca7517004f64c3d0fbd9e64c4d6715a32e39858

commit 3ca7517004f64c3d0fbd9e64c4d6715a32e39858
Author: Guillem Jover <[email protected]>
AuthorDate: Sun Sep 3 01:18:28 2023 +0200

    build: Parametrize dpkg-deb default compressor in man page
    
    We can control what the default compressor for dpkg-deb is from
    configure, but the man page was hardcoding the value.
---
 m4/dpkg-build.m4 | 1 +
 man/Makefile.am  | 1 +
 man/dpkg-deb.pod | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/m4/dpkg-build.m4 b/m4/dpkg-build.m4
index d815dd4ff..860d0d40e 100644
--- a/m4/dpkg-build.m4
+++ b/m4/dpkg-build.m4
@@ -79,6 +79,7 @@ AC_DEFUN([DPKG_DEB_COMPRESSOR], [
   AS_CASE([$with_deb_compressor],
     [gzip|xz], [:],
     [AC_MSG_ERROR([unsupported default compressor $with_deb_compressor])])
+  AC_SUBST([DEB_DEFAULT_COMPRESSOR], [$with_deb_compressor])
   AC_DEFINE_UNQUOTED([DEB_DEFAULT_COMPRESSOR],
     [COMPRESSOR_TYPE_]AS_TR_CPP(${with_deb_compressor}),
     [default dpkg-deb build compressor])
diff --git a/man/Makefile.am b/man/Makefile.am
index ffec41729..7b8c0f6ef 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -247,6 +247,7 @@ PODSUBST = $(SED) \
        -e 's:%PKGDATADIR%:$(pkgdatadir):g' \
        -e 's:%INSTDIR_ENVVAR%:DPKG_ROOT:g' \
        -e 's:%ADMINDIR_ENVVAR%:DPKG_ADMINDIR:g' \
+       -e 's:%DEB_DEFAULT_COMPRESSOR%:$(DEB_DEFAULT_COMPRESSOR):g' \
        # EOL
 
 MANFIXUP = $(SED) \
diff --git a/man/dpkg-deb.pod b/man/dpkg-deb.pod
index 5b96e987e..070d1d36b 100644
--- a/man/dpkg-deb.pod
+++ b/man/dpkg-deb.pod
@@ -274,7 +274,7 @@ gzip (since dpkg 1.17.0) and B<extreme> for xz.
 Specify which compression type to use when building a package.
 Allowed values are B<gzip>, B<xz> (since dpkg 1.15.6),
 B<zstd> (since dpkg 1.21.18)
-and B<none> (default is B<xz>).
+and B<none> (default is B<%DEB_DEFAULT_COMPRESSOR%>).
 
 =item B<--[no-]uniform-compression>
 

-- 
Dpkg.Org's dpkg

Reply via email to