The following commit has been merged in the master branch:
commit ebb721df8997021b6f6a3fcaa8be1450949e6dd4
Author: Guillem Jover <[email protected]>
Date: Wed Jul 1 10:23:19 2009 +0200
dpkg-scanpackages: Do not handle the Revision field
This field has already been parsed and handled by “dpkg-deb -I”.
The code is doubly useless, as additionally the version comparison is
done before the Revision has been folded into the Version field.
diff --git a/debian/changelog b/debian/changelog
index 18e5885..dbf44ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ dpkg (1.15.4) UNRELEASED; urgency=low
* Fix inverted logic when deciding to assume the architecture in dpkg-name
when the package didn't have such field.
* Do not take into account Revision and Package_Revision fields in dpkg-name
- as they have been handled already by “dpkg-deb -I”.
+ and dpkg-scanpackages as they have been handled already by “dpkg-deb -I”.
* Switch dpkg-scansources to use Dpkg::Cdata instead of duplicating the
.dsc parsing code. As a side effect it now handles properly bogus files.
* Do not remap obsolete fields in dpkg-scanpackages as they have been
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index a257082..8540dff 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -227,11 +227,6 @@ FILE:
}
$tv{'Size'} = $size;
- if (defined $tv{Revision} and length($tv{Revision})) {
- $tv{Version}.= '-'.$tv{Revision};
- delete $tv{Revision};
- }
-
push @{$packages{$p}}, {%tv};
}
close($find_h);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
