The following commit has been merged in the master branch:
commit 1165f6821681075eeed66ca9cf1e889a057f636c
Author: Ludovic Brenta <ludo...@ludovic-brenta.org>
Date: Wed Jun 15 06:48:10 2011 +0200
dpkg-gencontrol: Run du with --apparent-size for the Installed-Size field
This will give consistent results independent of build system.
Even though this will keep not providing accurate enough information
for the field's purpose and as such some times the size reported will
be less than the space eventually used, having the value changing
depending on the build system is just bogus.
Closes: #630533
Signed-off-by: Guillem Jover <guil...@debian.org>
diff --git a/debian/changelog b/debian/changelog
index 96857d2..5e7f3dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -92,6 +92,9 @@ dpkg (1.16.1) UNRELEASED; urgency=low
* Do not allow blank lines in field values. Closes: #308082
* Do not warn on missing architecture on packages in config-files state,
but then make sure the architecture field is usable. Closes: #604241
+ * Run du with --apparent-size when generating the Installed-Size field in
+ dpkg-gencontrol to get consistent results independent of build system.
+ Thanks to Ludovic Brenta <ludo...@ludovic-brenta.org>. Closes: #630533
[ Bill Allombert]
* Add support for Build-Features: build-arch. Closes: #229357
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 224d57b..f0e6964 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -301,7 +301,8 @@ if (!defined($substvars->get('Installed-Size'))) {
if (!$c) {
chdir("$packagebuilddir") ||
syserr(_g("chdir for du to \`%s'"), $packagebuilddir);
- exec("du", "-k", "-s", ".") or syserr(_g("unable to execute %s"),
"du");
+ exec("du", "-k", "-s", "--apparent-size", ".") or
+ syserr(_g("unable to execute %s"), "du");
}
my $duo = '';
while (<DU>) {
--
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
