This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
commit 328edcc9229ee95402107b39b1041eb5aaa24405 Author: Guillem Jover <[email protected]> Date: Sat Sep 2 02:03:01 2017 +0200 Dpkg::Control::FieldsCore: Complete field order for all control types The CTRL_PKG_DEB and CTRL_FILE_STATUS types were missing some allowed fields in their order list, which meant that the field information was not coherent. --- debian/changelog | 2 ++ scripts/Dpkg/Control/FieldsCore.pm | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ae1084f..20cdc5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,6 +48,8 @@ dpkg (1.19.0) UNRELEASED; urgency=medium Dpkg::Changelog::Parse. - Mark all missing CTRL_INDEX_SRC and CTRL_INDEX_PKG fields as allowed in Dpkg::Control::FieldsCore. + - Complete field order for CTRL_PKG_DEB and CTRL_FILE_STATUS types in + Dpkg::Control::FieldsCore. * Documentation: - Document currently accepted syntax for changelogs in deb-changelog(5). Closes: #858579 diff --git a/scripts/Dpkg/Control/FieldsCore.pm b/scripts/Dpkg/Control/FieldsCore.pm index 78e59d3..495495f 100644 --- a/scripts/Dpkg/Control/FieldsCore.pm +++ b/scripts/Dpkg/Control/FieldsCore.pm @@ -464,7 +464,7 @@ our %FIELD_ORDER = ( CTRL_PKG_DEB() => [ qw(Package Package-Type Source Version Built-Using Kernel-Version Built-For-Profiles Auto-Built-Package Architecture Subarchitecture - Installer-Menu-Item Essential Origin Bugs + Installer-Menu-Item Build-Essential Essential Origin Bugs Maintainer Installed-Size), &field_list_pkg_dep(), qw(Section Priority Multi-Arch Homepage Description Tag Task) ], @@ -492,12 +492,17 @@ our %FIELD_ORDER = ( qw(Source Binary-Only Version Distribution Urgency Maintainer Timestamp Date Closes Changes) ], - CTRL_FILE_STATUS() => [ # Same as fieldinfos in lib/dpkg/parse.c + CTRL_FILE_STATUS() => [ + # Same as fieldinfos in lib/dpkg/parse.c qw(Package Essential Status Priority Section Installed-Size Origin Maintainer Bugs Architecture Multi-Arch Source Version Config-Version Replaces Provides Depends Pre-Depends Recommends Suggests Breaks Conflicts Enhances Conffiles Description Triggers-Pending - Triggers-Awaited) + Triggers-Awaited), + # These are allowed here, but not tracked by lib/dpkg/parse.c. + qw(Auto-Built-Package Build-Essential Built-For-Profiles Built-Using + Homepage Installer-Menu-Item Kernel-Version Package-Type + Subarchitecture Tag Task) ], CTRL_REPO_RELEASE() => [ qw(Origin Label Suite Codename Changelogs Date Valid-Until -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/dpkg/dpkg.git
