Browse Source

dpkg-deb: Obsolete bzip2 and lzma compression methods

Guillem Jover 10 years ago
parent
commit
ef6187ded6
4 changed files with 29 additions and 29 deletions
  1. 1 0
      debian/changelog
  2. 21 21
      doc/README.feature-removal-schedule
  3. 3 3
      dpkg-deb/main.c
  4. 4 5
      man/dpkg-deb.man

+ 1 - 0
debian/changelog

@@ -6,6 +6,7 @@ dpkg (1.18.11) UNRELEASED; urgency=medium
     to be valid. Thanks to David Kalnischkies <david@kalnischkies.de>.
     to be valid. Thanks to David Kalnischkies <david@kalnischkies.de>.
   * Add support to dpkg-scanpackages for scanning a single binary file.
   * Add support to dpkg-scanpackages for scanning a single binary file.
     Thanks to Javier Serrano Polo <javier@jasp.net>. Closes: #833964
     Thanks to Javier Serrano Polo <javier@jasp.net>. Closes: #833964
+  * Obsolete dpkg-deb bzip2 and lzma compression methods by emitting errors.
   * Perl modules:
   * Perl modules:
     - Obsolete Source-Version substvar in Dpkg::Substvars by emitting errors.
     - Obsolete Source-Version substvar in Dpkg::Substvars by emitting errors.
   * Packaging:
   * Packaging:

+ 21 - 21
doc/README.feature-removal-schedule

@@ -27,27 +27,6 @@ Why:
  leftovers are automatically cleaned up on database parsing. So there's no
  leftovers are automatically cleaned up on database parsing. So there's no
  need anymore for this manual action.
  need anymore for this manual action.
 
 
-What: -Zlzma (dpkg-deb option value)
-Status: deprecated
-When: 1.17.x
-Warning: program
-Why:
- LZMA compression has some format deficiencies fixed by XZ, which is what
- upstream has replaced it with, as such there's no point in continuing to
- support compressing new .deb files with that format, although unpacking
- will be kept being supported to handle existing compressed files.
-
-What: -Zbzip2 (dpkg-deb option value)
-Status: deprecated
-When: 1.18.x
-Warning: program
-Why:
- bzip2 compression has been superseded by xz when it comes to size, and
- gzip is still faster, in Debian there's really not many packages using
- that compression, as such there's no point in continuing to support
- compressing new .deb files with that format, although unpacking
- will be kept being supported to handle existing compressed files.
-
 What: --control-path (dpkg-query option)
 What: --control-path (dpkg-query option)
 Status: deprecated
 Status: deprecated
 When: 1.18.x
 When: 1.18.x
@@ -172,3 +151,24 @@ Why:
  Should switch to use binary:Version or source:Version substvars.
  Should switch to use binary:Version or source:Version substvars.
  .
  .
  The code got changed to emit errors.
  The code got changed to emit errors.
+
+What: -Zlzma (dpkg-deb option value)
+Status: removed
+When: 1.18.11
+Warning: program
+Why:
+ LZMA compression has some format deficiencies fixed by XZ, which is what
+ upstream has replaced it with, as such there's no point in continuing to
+ support compressing new .deb files with that format, although unpacking
+ will be kept being supported to handle existing compressed files.
+
+What: -Zbzip2 (dpkg-deb option value)
+Status: removed
+When: 1.18.11
+Warning: program
+Why:
+ bzip2 compression has been superseded by xz when it comes to size, and
+ gzip is still faster, in Debian there's really not many packages using
+ that compression, as such there's no point in continuing to support
+ compressing new .deb files with that format, although unpacking
+ will be kept being supported to handle existing compressed files.

+ 3 - 3
dpkg-deb/main.c

@@ -109,7 +109,7 @@ usage(const struct cmdinfo *cip, const char *value)
 "      --uniform-compression        Use the compression params on all members.\n"
 "      --uniform-compression        Use the compression params on all members.\n"
 "  -z#                              Set the compression level when building.\n"
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when building.\n"
 "  -Z<type>                         Set the compression type used when building.\n"
-"                                     Allowed types: gzip, xz, bzip2, none.\n"
+"                                     Allowed types: gzip, xz, none.\n"
 "  -S<strategy>                     Set the compression strategy when building.\n"
 "  -S<strategy>                     Set the compression strategy when building.\n"
 "                                     Allowed values: none; extreme (xz);\n"
 "                                     Allowed values: none; extreme (xz);\n"
 "                                     filtered, huffman, rle, fixed (gzip).\n"
 "                                     filtered, huffman, rle, fixed (gzip).\n"
@@ -213,9 +213,9 @@ set_compress_type(const struct cmdinfo *cip, const char *value)
   if (compress_params.type == COMPRESSOR_TYPE_UNKNOWN)
   if (compress_params.type == COMPRESSOR_TYPE_UNKNOWN)
     badusage(_("unknown compression type '%s'!"), value);
     badusage(_("unknown compression type '%s'!"), value);
   if (compress_params.type == COMPRESSOR_TYPE_LZMA)
   if (compress_params.type == COMPRESSOR_TYPE_LZMA)
-    warning(_("deprecated compression type '%s'; use xz instead"), value);
+    badusage(_("obsolete compression type '%s'; use xz instead"), value);
   if (compress_params.type == COMPRESSOR_TYPE_BZIP2)
   if (compress_params.type == COMPRESSOR_TYPE_BZIP2)
-    warning(_("deprecated compression type '%s'; use xz or gzip instead"), value);
+    badusage(_("obsolete compression type '%s'; use xz or gzip instead"), value);
 }
 }
 
 
 static const struct cmdinfo cmdinfos[]= {
 static const struct cmdinfo cmdinfos[]= {

+ 4 - 5
man/dpkg-deb.man

@@ -230,10 +230,10 @@ The default for this field is “${Package}\\t${Version}\\n”.
 .TP
 .TP
 .BI \-z compress-level
 .BI \-z compress-level
 Specify which compression level to use on the compressor backend, when
 Specify which compression level to use on the compressor backend, when
-building a package (default is 9 for gzip and bzip2, 6 for xz and lzma).
-The accepted values are 0-9 with: 0 being mapped to compressor none for
-gzip and 0 mapped to 1 for bzip2. Before dpkg 1.16.2 level 0 was
-equivalent to compressor none for all compressors.
+building a package (default is 9 for gzip, 6 for xz).
+The accepted values are 0-9 with: 0 being mapped to compressor none for gzip.
+Before dpkg 1.16.2 level 0 was equivalent to compressor none for all
+compressors.
 .TP
 .TP
 .BI \-S compress-strategy
 .BI \-S compress-strategy
 Specify which compression strategy to use on the compressor backend, when
 Specify which compression strategy to use on the compressor backend, when
@@ -244,7 +244,6 @@ gzip (since dpkg 1.17.0) and \fBextreme\fP for xz.
 .BI \-Z compress-type
 .BI \-Z compress-type
 Specify which compression type to use when building a package.
 Specify which compression type to use when building a package.
 Allowed values are \fBgzip\fP, \fBxz\fP (since dpkg 1.15.6),
 Allowed values are \fBgzip\fP, \fBxz\fP (since dpkg 1.15.6),
-\fBbzip2\fP (deprecated), \fBlzma\fP (since dpkg 1.14.0; deprecated),
 and \fBnone\fP (default is \fBxz\fP).
 and \fBnone\fP (default is \fBxz\fP).
 .TP
 .TP
 .B \-\-uniform\-compression
 .B \-\-uniform\-compression