The following commit has been merged in the master branch: commit a3454abb5b83ac12aec5c52f2ae4492faf6890c8 Author: Guillem Jover <guil...@debian.org> Date: Fri Jun 26 01:52:58 2009 +0200
dpkg-split: Use the correct units (KiB) when referring to partsize diff --git a/debian/changelog b/debian/changelog index 3566257..d7e4b83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ dpkg (1.15.3) UNRELEASED; urgency=low * Fix dpkg-scanpackages to properly detect spurious overrides. * Rewrite dpkg-name in perl. * Do not close already closed files in some error conditions in libdpkg. + * Use the correct units (KiB) in dpkg-split when referring to partsize. [ Raphael Hertzog ] * Unset TAR_OPTIONS when creating/extracting tar archives for source diff --git a/dpkg-split/main.c b/dpkg-split/main.c index 2b8640a..55d8e41 100644 --- a/dpkg-split/main.c +++ b/dpkg-split/main.c @@ -122,7 +122,7 @@ static void setpartsize(const struct cmdinfo *cip, const char *value) { maxpartsize= newpartsize << 10; if (maxpartsize <= HEADERALLOWANCE) - badusage(_("part size must be at least %dk (to allow for header)"), + badusage(_("part size must be at least %d KiB (to allow for header)"), (HEADERALLOWANCE >> 10) + 1); } diff --git a/man/dpkg-split.1 b/man/dpkg-split.1 index e0ba1f7..7d56532 100644 --- a/man/dpkg-split.1 +++ b/man/dpkg-split.1 @@ -141,8 +141,8 @@ Specifies an alternative directory for the queue of parts awaiting automatic reassembly. The default is .BR /var/lib/dpkg . .TP -.BR \-S ", " \-\-partsize " \fIkbytes\fP" -Specifies the maximum part size when splitting, in kilobytes (1024 +.BR \-S ", " \-\-partsize " \fIkibibytes\fP" +Specifies the maximum part size when splitting, in kibibytes (1024 bytes). The default is 450 KiB. .TP .BR \-o ", " \-\-output " \fIcomplete-output\fP" -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org