This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=805a3344125e6d7e7480d3be2ba1cafb03c6e3c5 commit 805a3344125e6d7e7480d3be2ba1cafb03c6e3c5 Author: Guillem Jover <guil...@debian.org> AuthorDate: Tue Dec 21 23:59:41 2021 +0100 Dpkg::Control::FieldsCore: Sort control type entries in %FIELD_ORDER --- scripts/Dpkg/Control/FieldsCore.pm | 60 +++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/scripts/Dpkg/Control/FieldsCore.pm b/scripts/Dpkg/Control/FieldsCore.pm index d1ef32ed5..a6d73dfdd 100644 --- a/scripts/Dpkg/Control/FieldsCore.pm +++ b/scripts/Dpkg/Control/FieldsCore.pm @@ -611,6 +611,13 @@ my @src_checksums_fields = qw(checksums-md5 checksums-sha1 checksums-sha256); my @bin_checksums_fields = qw(md5sum sha1 sha256); our %FIELD_ORDER = ( + CTRL_PKG_SRC() => [ + qw(format source binary architecture version origin maintainer + uploaders homepage description standards-version vcs-browser + vcs-arch vcs-bzr vcs-cvs vcs-darcs vcs-git vcs-hg vcs-mtn + vcs-svn testsuite testsuite-triggers), @src_dep_fields, + qw(package-list), @src_checksums_fields, qw(files) + ], CTRL_PKG_DEB() => [ qw(package package-type source version built-using kernel-version built-for-profiles auto-built-package architecture subarchitecture @@ -618,6 +625,13 @@ our %FIELD_ORDER = ( maintainer installed-size), @bin_dep_fields, qw(section priority multi-arch homepage description tag task) ], + CTRL_INDEX_SRC() => [ + qw(format package binary architecture version priority section origin + maintainer uploaders homepage description standards-version vcs-browser + vcs-arch vcs-bzr vcs-cvs vcs-darcs vcs-git vcs-hg vcs-mtn vcs-svn + testsuite testsuite-triggers), @src_dep_fields, + qw(package-list directory), @src_checksums_fields, qw(files) + ], CTRL_INDEX_PKG() => [ qw(package package-type source version built-using kernel-version built-for-profiles auto-built-package architecture subarchitecture @@ -626,19 +640,23 @@ our %FIELD_ORDER = ( qw(filename size), @bin_checksums_fields, qw(section priority multi-arch homepage description tag task) ], - CTRL_PKG_SRC() => [ - qw(format source binary architecture version origin maintainer - uploaders homepage description standards-version vcs-browser - vcs-arch vcs-bzr vcs-cvs vcs-darcs vcs-git vcs-hg vcs-mtn - vcs-svn testsuite testsuite-triggers), @src_dep_fields, - qw(package-list), @src_checksums_fields, qw(files) + CTRL_REPO_RELEASE() => [ + qw(origin label suite codename changelogs date valid-until + architectures components description), @bin_checksums_fields ], - CTRL_INDEX_SRC() => [ - qw(format package binary architecture version priority section origin - maintainer uploaders homepage description standards-version vcs-browser - vcs-arch vcs-bzr vcs-cvs vcs-darcs vcs-git vcs-hg vcs-mtn vcs-svn - testsuite testsuite-triggers), @src_dep_fields, - qw(package-list directory), @src_checksums_fields, qw(files) + CTRL_CHANGELOG() => [ + qw(source binary-only version distribution urgency maintainer + timestamp date closes changes) + ], + CTRL_COPYRIGHT_HEADER() => [ + qw(format upstream-name upstream-contact source disclaimer comment + license copyright) + ], + CTRL_COPYRIGHT_FILES() => [ + qw(files copyright license comment) + ], + CTRL_COPYRIGHT_LICENSE() => [ + qw(license comment) ], CTRL_FILE_BUILDINFO() => [ qw(format source binary architecture version binary-only-changes), @@ -651,10 +669,6 @@ our %FIELD_ORDER = ( version distribution urgency maintainer changed-by description closes changes), @src_checksums_fields, qw(files) ], - CTRL_CHANGELOG() => [ - qw(source binary-only version distribution urgency maintainer - timestamp date closes changes) - ], CTRL_FILE_STATUS() => [ # Same as fieldinfos in lib/dpkg/parse.c qw(package essential protected status priority section installed-size @@ -668,20 +682,6 @@ our %FIELD_ORDER = ( homepage installer-menu-item kernel-version package-type subarchitecture tag task) ], - CTRL_REPO_RELEASE() => [ - qw(origin label suite codename changelogs date valid-until - architectures components description), @bin_checksums_fields - ], - CTRL_COPYRIGHT_HEADER() => [ - qw(format upstream-name upstream-contact source disclaimer comment - license copyright) - ], - CTRL_COPYRIGHT_FILES() => [ - qw(files copyright license comment) - ], - CTRL_COPYRIGHT_LICENSE() => [ - qw(license comment) - ], ); =encoding utf8 -- Dpkg.Org's dpkg
