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=f7978c885eda594b5d2218bbde1156c02e4ed703 commit f7978c885eda594b5d2218bbde1156c02e4ed703 Author: Guillem Jover <[email protected]> AuthorDate: Mon Jul 22 04:44:24 2024 +0200 dpkg-deb: Add long options for short-only compression ones This matches the same compression long option names used by dpkg-source and dpkg-buildpackage. --- man/dpkg-deb.pod | 14 ++++++++------ src/deb/main.c | 13 +++++++------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/man/dpkg-deb.pod b/man/dpkg-deb.pod index 40d29a77d..2a8603cc4 100644 --- a/man/dpkg-deb.pod +++ b/man/dpkg-deb.pod @@ -263,10 +263,11 @@ L<dpkg-query(1)>. The default for this field is “${Package}\t${Version}\n”. -=item B<-z>I<compress-level> +=item B<-z>, B<--compression-level=>I<compress-level> Specify which compression level to use on the compressor backend, when -building a package (default is 9 for gzip, 6 for xz, 3 for zstd). +building a package (default is 9 for gzip, 6 for xz, 3 for zstd; +long option since dpkg 1.22.9). The accepted values are compressor specific. For gzip, from 0-9 with 0 being mapped to compressor none. For xz from 0-9. @@ -274,17 +275,18 @@ For zstd from 0-22, with levels from 20 to 22 enabling its ultra mode. Before dpkg 1.16.2 level 0 was equivalent to compressor none for all compressors. -=item B<-S>I<compress-strategy> +=item B<-S>, B<--compression-strategy=>I<compress-strategy> Specify which compression strategy to use on the compressor backend, when -building a package (since dpkg 1.16.2). +building a package (since dpkg 1.16.2, long option since dpkg 1.22.9). Allowed values are B<none> (since dpkg 1.16.4), B<filtered>, B<huffman>, B<rle> and B<fixed> for gzip (since dpkg 1.17.0) and B<extreme> for xz. -=item B<-Z>I<compress-type> +=item B<-Z>, B<--compression=>I<compress-type> -Specify which compression type to use when building a package. +Specify which compression type to use when building a package +(long option since dpkg 1.22.9). 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<%DEB_DEFAULT_COMPRESSOR%>). diff --git a/src/deb/main.c b/src/deb/main.c index b7fe11c25..b7a19b27f 100644 --- a/src/deb/main.c +++ b/src/deb/main.c @@ -107,10 +107,11 @@ usage(const char *const *argv) " --root-owner-group Forces the owner and groups to root.\n" " --threads-max=<threads> Use at most <threads> with compressor.\n" " --[no-]uniform-compression Use the compression params on all members.\n" -" -z# Set the compression level when building.\n" -" -Z<type> Set the compression type used when building.\n" +" -Z, --compression=<compressor> Set build compression type.\n" " Allowed types: gzip, xz, zstd, none.\n" -" -S<strategy> Set the compression strategy when building.\n" +" -z, --compression-level=<level> Set build compression level.\n" +" -S, --compression-strategy=<name>\n" +" Set build compression strategy.\n" " Allowed values: none; extreme (xz);\n" " filtered, huffman, rle, fixed (gzip).\n" "\n")); @@ -270,9 +271,9 @@ static const struct cmdinfo cmdinfos[]= { { "threads-max", 0, 1, NULL, NULL, set_threads_max }, { "uniform-compression", 0, 0, &opt_uniform_compression, NULL, NULL, 1 }, { "no-uniform-compression", 0, 0, &opt_uniform_compression, NULL, NULL, 0 }, - { NULL, 'z', 1, NULL, NULL, set_compress_level }, - { NULL, 'Z', 1, NULL, NULL, set_compress_type }, - { NULL, 'S', 1, NULL, NULL, set_compress_strategy }, + { "compression", 'Z', 1, NULL, NULL, set_compress_type }, + { "compression-level", 'z', 1, NULL, NULL, set_compress_level }, + { "compression-strategy", 'S', 1, NULL, NULL, set_compress_strategy }, { "showformat", 0, 1, NULL, &opt_showformat, NULL }, { NULL, 0, 0, NULL, NULL, NULL } }; -- Dpkg.Org's dpkg
