From 404dececf913d3c09368a73ca00aa8172dbf6865 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Fri, 20 Oct 2017 23:37:36 +0200
Subject: Fix testsuite for and add new fields from dpkg 1.19

tagfile-order.c: Add missing fields from dpkg 1.19

For binary packages, this is Build-Essential; for source packages,
it is Description.

test-bug-718329-...: Ignore control.tar.*, changes in dpkg 1.19

test-apt-extracttemplates: Fix for dpkg 1.19
---
 apt-pkg/tagfile-order.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'apt-pkg/tagfile-order.c')

diff --git a/apt-pkg/tagfile-order.c b/apt-pkg/tagfile-order.c
index 0347d8b76..4c2068c00 100644
--- a/apt-pkg/tagfile-order.c
+++ b/apt-pkg/tagfile-order.c
@@ -11,10 +11,10 @@ static const char *iTFRewritePackageOrder[] = {
    "Architecture",
    "Subarchitecture", // Used only by d-i
    "Version",
-   "Revision",         // Obsolete (warning in dpkg)
+   "Revision",	 // Obsolete (warning in dpkg)
    "Package-Revision", // Obsolete (warning in dpkg)
    "Package_Revision", // Obsolete (warning in dpkg)
-   "Kernel-Version", // Used only by d-i
+   "Kernel-Version",   // Used only by d-i
    "Built-Using",
    "Built-For-Profiles",
    "Auto-Built-Package",
@@ -22,6 +22,7 @@ static const char *iTFRewritePackageOrder[] = {
    "Status",
    "Priority",
    "Class", // dpkg nickname for Priority
+   "Build-Essential",
    "Essential",
    "Installer-Menu-Item", // Used only by d-i
    "Section",
@@ -57,7 +58,7 @@ static const char *iTFRewritePackageOrder[] = {
    "Description",
    "Tag",
    "Task",
-   0
+   0,
 };
 static const char *iTFRewriteSourceOrder[] = {
    "Package",
@@ -84,6 +85,7 @@ static const char *iTFRewriteSourceOrder[] = {
    "Testsuite",
    "Testsuite-Triggers",
    "Homepage",
+   "Description",
    "Vcs-Browser",
    "Vcs-Browse", // dak only (nickname?)
    "Vcs-Arch",
@@ -101,7 +103,7 @@ static const char *iTFRewriteSourceOrder[] = {
    "Checksums-Sha1",
    "Checksums-Sha256",
    "Checksums-Sha512",
-   0
+   0,
 };
 
 /* Two levels of initialization are used because gcc will set the symbol
-- 
cgit v1.2.3