[lintian] 01/01: Correct inconsistent use of "header" terminology (versus "field", etc.) in descriptions and tag names. (Closes: #890959)
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit 4960b883510805450914344df900091874c13528
Author: Ben Finney <bignose@debian.org>
Date: Wed Feb 21 15:09:56 2018 +0000
Correct inconsistent use of "header" terminology (versus "field", etc.) in descriptions and tag names. (Closes: #890959)
Signed-off-by: Chris Lamb <lamby@debian.org>
---
checks/control-file.desc | 8 +++----
checks/control-file.pm | 4 ++--
checks/copyright-file.pm | 6 ++---
checks/cruft.desc | 2 +-
checks/description.desc | 11 ++++-----
checks/fields.desc | 4 ++--
checks/fields.pm | 2 +-
checks/menu-format.desc | 6 ++---
checks/menu-format.pm | 2 +-
checks/source-copyright.desc | 18 +++++++--------
checks/source-copyright.pm | 10 ++++-----
checks/testsuite.desc | 2 +-
checks/testsuite.pm | 2 +-
data/override/renamed-tags | 7 ++++--
debian/changelog | 5 +++++
private/tag-stats | 2 +-
t/COVERAGE | 4 ++--
t/scripts/changelog-format.t | 8 +++----
t/tests/control-file-general/desc | 2 +-
t/tests/control-file-general/tags | 2 +-
t/tests/control-has-empty-field/desc | 2 +-
t/tests/control-has-empty-field/tags | 2 +-
.../debian/debian/control.in | 18 ---------------
.../desc | 7 ------
.../tags | 1 -
t/tests/legacy-binary/desc | 4 ++--
t/tests/legacy-binary/tags | 4 ++--
.../source-copyright-license-header/debian/README | 1 -
.../debian/debian/copyright | 26 ----------------------
t/tests/source-copyright-license-header/desc | 6 -----
t/tests/source-copyright-license-header/tags | 2 --
t/tests/testsuite-unknown-suite/desc | 2 +-
t/tests/testsuite-unknown-suite/tags | 2 +-
.../debian/debian/control.in | 17 --------------
.../debian/debian/tests/control | 1 -
.../debian/debian/tests/test-1 | 2 --
.../desc | 5 -----
.../tags | 1 -
38 files changed, 66 insertions(+), 144 deletions(-)
diff --git a/checks/control-file.desc b/checks/control-file.desc
index 820fc4d..2b2516b 100644
--- a/checks/control-file.desc
+++ b/checks/control-file.desc
@@ -105,20 +105,20 @@ Info: The <tt>debian/control</tt> file places the indicated binary package
area of the archive, with the single exception that source packages in
main may also build binary packages in contrib.
-Tag: xs-vcs-header-in-debian-control
+Tag: xs-vcs-field-in-debian-control
Severity: wishlist
Certainty: certain
Info: There is an XS-Vcs-* field in the <tt>debian/control</tt> file. As
of dpkg 1.14.6, the XS- prefix is no longer necessary. dpkg now
- recognizes these headers and handles them correctly. Consider removing
+ recognizes these fields and handles them correctly. Consider removing
the XS- prefix for this field.
-Tag: xs-testsuite-header-in-debian-control
+Tag: xs-testsuite-field-in-debian-control
Severity: wishlist
Certainty: certain
Info: There is an XS-Testsuite field in the <tt>debian/control</tt> file. As
of dpkg 1.17.10, the XS- prefix is no longer necessary. dpkg now
- recognizes this header and handles it correctly. As of dpkg 1.17.11 the
+ recognizes this field and handles it correctly. As of dpkg 1.17.11 the
field is automatically added by dpkg-source with the value "autopkgtest" if
there is a non-empty <tt>debian/tests/control</tt> file present. Consider
either removing the XS- prefix for this field or removing the field
diff --git a/checks/control-file.pm b/checks/control-file.pm
index 1799427..f2a97b2 100644
--- a/checks/control-file.pm
+++ b/checks/control-file.pm
@@ -92,11 +92,11 @@ sub run {
if ($field =~ /^xs-vcs-/) {
my $base = $field;
$base =~ s/^xs-//;
- tag 'xs-vcs-header-in-debian-control', $field
+ tag 'xs-vcs-field-in-debian-control', $field
if $src_fields->known($base);
}
if ($field eq 'xs-testsuite') {
- tag 'xs-testsuite-header-in-debian-control', $field;
+ tag 'xs-testsuite-field-in-debian-control', $field;
}
if ($field eq 'xc-package-type') {
tag 'xc-package-type-in-debian-control', "line $.";
diff --git a/checks/copyright-file.pm b/checks/copyright-file.pm
index d816979..58775d8 100644
--- a/checks/copyright-file.pm
+++ b/checks/copyright-file.pm
@@ -225,9 +225,9 @@ sub run {
# This check is a bit prone to false positives, since some other
# licenses mention the GPL. Also exclude any mention of the GPL
- # following what looks like mail headers, since sometimes e-mail
- # discussions of licensing are included in the copyright file but
- # aren't referring to the license of the package.
+ # following what looks like mail header fields, since sometimes
+ # e-mail discussions of licensing are included in the copyright
+ # file but aren't referring to the license of the package.
if (
not(
m,/usr/share/common-licenses,
diff --git a/checks/cruft.desc b/checks/cruft.desc
index b1e7ffe..d9f0627 100644
--- a/checks/cruft.desc
+++ b/checks/cruft.desc
@@ -643,7 +643,7 @@ Info: This package appears to be covered by version 3.0 (exactly) of the
and has no contributions from the PHP Group.
.
This tag is not emitted for packages from pecl.php.net as determined by
- the <tt>Source:</tt> header in <tt>debian/copyright</tt>.
+ the <tt>Source:</tt> field in <tt>debian/copyright</tt>.
Ref: https://ftp-master.debian.org/REJECT-FAQ.html
Tag: license-problem-gfdl-invariants
diff --git a/checks/description.desc b/checks/description.desc
index 50839d7..57072ee 100644
--- a/checks/description.desc
+++ b/checks/description.desc
@@ -190,11 +190,12 @@ Ref: policy 3.4.1
Tag: description-contains-homepage
Severity: normal
Certainty: certain
-Info: The extended description contains a "Homepage:" pseudo-header
- following the old Developer's Reference recommendation. As of 1.14.6,
- dpkg now supports Homepage: as a regular field in
- <tt>debian/control</tt>. This header should be moved from the extended
- description to the fields for the relevant source or binary packages.
+Info: The extended description contains a "Homepage" pseudo-field
+ following the old Developer's Reference recommendation. As of 1.14.6,
+ dpkg now supports Homepage as a regular field in
+ <tt>debian/control</tt>. This pseudo-field should be moved from the
+ extended description to the fields for the relevant source or binary
+ packages.
Tag: spelling-error-in-description
Severity: minor
diff --git a/checks/fields.desc b/checks/fields.desc
index 151f3c1..a455caa 100644
--- a/checks/fields.desc
+++ b/checks/fields.desc
@@ -1388,7 +1388,7 @@ Info:
Tag: vcs-deprecated-in-debian-infrastructure
Severity: pedantic
Certainty: certain
-Info: The spcified Vcs-* header points to an area within the *.debian.org
+Info: The specified Vcs-* field points to an area within the *.debian.org
infrastructure but refers to a version control system that has been
deprecated.
.
@@ -1400,7 +1400,7 @@ Info: The spcified Vcs-* header points to an area within the *.debian.org
Git.
Ref: https://lists.debian.org/debian-devel-announce/2017/08/msg00008.html
-Tag: co-maintained-package-with-no-vcs-headers
+Tag: co-maintained-package-with-no-vcs-fields
Severity: pedantic
Certainty: possible
Info: Based on the content of the maintainer and uploader fields this
diff --git a/checks/fields.pm b/checks/fields.pm
index ce545a2..2ef0d47 100644
--- a/checks/fields.pm
+++ b/checks/fields.pm
@@ -1387,7 +1387,7 @@ sub run {
tag 'vcs-fields-use-more-than-one-vcs', sort keys %seen_vcs
if keys %seen_vcs > 1;
- tag 'co-maintained-package-with-no-vcs-headers'
+ tag 'co-maintained-package-with-no-vcs-fields'
if $type eq 'source'
and $is_comaintained
and not %seen_vcs;
diff --git a/checks/menu-format.desc b/checks/menu-format.desc
index 9e205f3..48ef541 100644
--- a/checks/menu-format.desc
+++ b/checks/menu-format.desc
@@ -384,11 +384,11 @@ Info: The desktop entry specifies a command that is not available in the
desktop file for a command should be included in the same package as that
command.
-Tag: desktop-contains-deprecated-header
+Tag: desktop-contains-deprecated-key
Severity: normal
Certainty: certain
-Info: The header on this line of the desktop entry has been deprecated in the
- FreeDesktop specification. If the header is "KDE Desktop Entry", the right
+Info: The key on this line of the desktop entry has been deprecated in the
+ FreeDesktop specification. If the key is "KDE Desktop Entry", the right
fix is normally changing it to "Desktop Entry".
.
The desktop-file-validate tool in the desktop-file-utils package is
diff --git a/checks/menu-format.pm b/checks/menu-format.pm
index 28a96ac..9813ac9 100644
--- a/checks/menu-format.pm
+++ b/checks/menu-format.pm
@@ -577,7 +577,7 @@ sub verify_desktop_file {
unless ($saw_first) {
return unless $line =~ /^\[(KDE )?Desktop Entry\]\s*$/;
$saw_first = 1;
- tag 'desktop-contains-deprecated-header', "$file:$."
+ tag 'desktop-contains-deprecated-key', "$file:$."
if ($line =~ /^\[KDE Desktop Entry\]\s*$/);
}
diff --git a/checks/source-copyright.desc b/checks/source-copyright.desc
index 0881e7e..fbe3034 100644
--- a/checks/source-copyright.desc
+++ b/checks/source-copyright.desc
@@ -159,21 +159,21 @@ Tag: invalid-short-name-in-dep5-copyright
Severity: minor
Certainty: certain
Ref: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Info: The license header contains a short name observed to be a
+Info: The “License” field contains a short name observed to be a
misspelling of one of the standard short names.
Tag: space-in-std-shortname-in-dep5-copyright
Severity: minor
Certainty: certain
Ref: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Info: The license header contains a short name with a space, which
+Info: The “License” field contains a short name with a space, which
does not conform to the specification.
Tag: bad-exception-format-in-dep5-copyright
Severity: minor
Certainty: certain
Ref: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Info: The license header contains a short name with a bad exception
+Info: The “License” field contains a short name with a bad exception
format. According to specification format of exception is:
shortlicencename with exceptionname exception.
.
@@ -191,8 +191,8 @@ Tag: missing-license-text-in-dep5-copyright
Severity: normal
Certainty: possible
Ref: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Info: The standalone license header contains only short license name, but not
- the license text.
+Info: The standalone “License” paragraph contains only short license
+ name, but not the license text.
Tag: unused-license-paragraph-in-dep5-copyright
Severity: minor
@@ -330,7 +330,7 @@ Info: The <tt>Files</tt> paragraph in debian/copyright appears to be
Tag: source-includes-file-in-files-excluded
Severity: serious
Certainty: possible
-Info: A file specified in the <tt>Files-Excluded</tt> header in
+Info: A file specified in the <tt>Files-Excluded</tt> field in
debian/copyright exists in the source tree.
.
This might be a DFSG violation, the referenced files are probably not
@@ -395,7 +395,7 @@ Tag: missing-explanation-for-contrib-or-non-free-package
Severity: wishlist
Certainty: certain
Info: The specified package is in the contrib or non-free archive
- area but does not include a "Comment" (or "Disclaimer") header in
+ area but does not include a "Comment" (or "Disclaimer") field in
its copyright file.
.
Please add a brief comment why this package cannot be part of the
@@ -408,7 +408,7 @@ Certainty: possible
Info: The version of this package contains <tt>dfsg</tt>, <tt>ds</tt>,
or <tt>debian</tt> which normally indicates that the upstream source
has been repackaged, but there is no "Comment" or "Files-Excluded"
- header in its copyright file which explains the reason why.
+ field in its copyright file which explains the reason why.
.
Please add a comment why this tarball was repacked or add a suitable
- "Files-Excluded" header.
+ "Files-Excluded" field.
diff --git a/checks/source-copyright.pm b/checks/source-copyright.pm
index 66c0e4c..ae22669 100644
--- a/checks/source-copyright.pm
+++ b/checks/source-copyright.pm
@@ -287,15 +287,15 @@ sub _parse_dep5 {
if $info->repacked
and none { defined $first_para->{$_} } qw(comment files-excluded);
- my (undef, $full_license_header, undef,@short_licenses_header)
+ my (undef, $full_license_field, undef,@short_licenses_field)
=parse_license($first_para->{'license'}, 1);
- for my $short_license (@short_licenses_header) {
+ for my $short_license (@short_licenses_field) {
$required_standalone_licenses{$short_license} = 0
- if not defined($full_license_header);
+ if not defined($full_license_field);
$short_licenses_seen{$short_license} = 1;
}
- if(defined($full_license_header)) {
- for (@short_licenses_header) {
+ if(defined($full_license_field)) {
+ for (@short_licenses_field) {
$standalone_licenses{$_} = -1;
$full_licenses_seen{$_} = 1;
}
diff --git a/checks/testsuite.desc b/checks/testsuite.desc
index 526ab6e..2266193 100644
--- a/checks/testsuite.desc
+++ b/checks/testsuite.desc
@@ -140,7 +140,7 @@ Info: This package does not declare a test suite. Having a test suite helps with
For more information on how to add functional tests to your package, browse to
https://ci.debian.net/doc/.
-Tag: unnecessary-testsuite-autopkgtest-header
+Tag: unnecessary-testsuite-autopkgtest-field
Severity: normal
Certainty: certain
Info: You do not need to specify a <tt>Testsuite: autopkgtest</tt> field if
diff --git a/checks/testsuite.pm b/checks/testsuite.pm
index dbd6088..58321e6 100644
--- a/checks/testsuite.pm
+++ b/checks/testsuite.pm
@@ -106,7 +106,7 @@ sub run {
check_control_contents($info, $path);
}
- tag 'unnecessary-testsuite-autopkgtest-header'
+ tag 'unnecessary-testsuite-autopkgtest-field'
if $info->source_field('testsuite') // '' eq 'autopkgtest';
}
return;
diff --git a/data/override/renamed-tags b/data/override/renamed-tags
index 0d21c5e..d52e56a 100644
--- a/data/override/renamed-tags
+++ b/data/override/renamed-tags
@@ -1,12 +1,15 @@
# list of renamed tag old name => new name. Please alpha sort by old name
-dep5-file-paragraph-reference-header-paragraph => dep5-file-paragraph-references-header-paragraph
debian-changelog-has-wrong-weekday => debian-changelog-has-wrong-day-of-week
debian-watch-may-check-gpg-signature => debian-watch-does-not-check-gpg-signature
+dep5-file-paragraph-reference-header-paragraph => dep5-file-paragraph-references-header-paragraph
+fields-co-maintained-package-with-no-vcs-headers => fields-co-maintained-package-with-no-vcs-fields
package-install-apt-preferences => package-installs-apt-preferences
package-install-apt-sources => package-installs-apt-sources
package-install-ieee-data => package-installs-ieee-data
package-install-into-obsolete-dir => package-installs-into-obsolete-dir
privacy-breach-may-use-debian-package => privacy-breach-uses-embedded-file
-systemd-no-service-for-init-script => omitted-systemd-service-for-init.d-script
+source-copyright-license-header => source-copyright-license-field
systemd-no-service-for-init-rcS-script => missing-systemd-service-for-init.d-rcS-script
+systemd-no-service-for-init-script => omitted-systemd-service-for-init.d-script
+testsuite-unnecessary-testsuite-autopkgtest-header => testsuite-unnecessary-testsuite-autopkgtest-field
transitional-package-should-be-oldlibs-extra => transitional-package-should-be-oldlibs-optional
diff --git a/debian/changelog b/debian/changelog
index d4c317b..9641dd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ lintian (2.5.76) UNRELEASED; urgency=medium
XXX: generate tag summary
+ * General:
+ + [CL] Apply a patch series from Ben Finney to correct inconsistent use
+ of "header" terminology (versus "field", etc.) in descriptions and
+ tag names. Thanks! (Closes: #890959)
+
* checks/cruft.pm:
+ [CL] Avoid false-positives in Jush's syntax highlighting definition
files.
diff --git a/private/tag-stats b/private/tag-stats
index 2b35c88..78ea0f4 100755
--- a/private/tag-stats
+++ b/private/tag-stats
@@ -3,7 +3,7 @@
# tag-stats - tag classification statistics
#
# This script displays statistics and data for tag classification based on
-# Severity/Certainty headers and their mapping to a E/W/I code.
+# Severity/Certainty fields and their mapping to a E/W/I code.
#
# The verbose options (-v, -vv, -vvv) can be used to display a detailed list
# of which tags are assigned to each category.
diff --git a/t/COVERAGE b/t/COVERAGE
index 1b29fdb..d7eb964 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -44,7 +44,7 @@ init.d postrm-does-not-call-updaterc.d-for-init.d-script
init.d preinst-calls-updaterc.d
init.d prerm-calls-updaterc.d
-menu-format desktop-contains-deprecated-header
+menu-format desktop-contains-deprecated-key
menu-format desktop-entry-missing-required-key
menu-format menu-item-missing-required-tag
menu-format menu-item-needs-tag-has-unknown-value
@@ -86,7 +86,7 @@ Breakdown of remaining tags in legacy test suite by test case:
binary
binary-has-unneeded-section
- desktop-contains-deprecated-header
+ desktop-contains-deprecated-key
desktop-entry-missing-required-key
doc-base-document-field-ends-in-whitespace
doc-base-file-duplicated-format
diff --git a/t/scripts/changelog-format.t b/t/scripts/changelog-format.t
index 969b370..9a4fb92 100755
--- a/t/scripts/changelog-format.t
+++ b/t/scripts/changelog-format.t
@@ -36,7 +36,7 @@ my $line = 0;
my $prev_head = '';
my $release_header = 0;
my $is_release = 1;
-my $saw_todo_header = 0;
+my $saw_todo_marker = 0;
$is_release = 0 if $changelog->dpkg->{'Distribution'} eq 'UNRELEASED';
foreach (split /\n/,$changes) {
@@ -54,7 +54,7 @@ foreach (split /\n/,$changes) {
# Ignore the reminder to generate the tag summary
if ($line < 10 && m/XXX: generate tag summary/) {
- $saw_todo_header = 1;
+ $saw_todo_marker = 1;
next;
}
@@ -121,11 +121,11 @@ foreach (split /\n/,$changes) {
}
if ($is_release) {
- ok(!$saw_todo_header,
+ ok(!$saw_todo_marker,
'RELEASE BUILD WITH TODO-marker in changelog for tag summary!')
or diag('Replace it with output of private/generate-tag-summary');
} else {
- ok($saw_todo_header,
+ ok($saw_todo_marker,
'UNRELEASED but NO TODO-marker in changelog for tag summary!')
or diag('Instead an "XXX: generate tag summary" in d/changelog');
}
diff --git a/t/tests/control-file-general/desc b/t/tests/control-file-general/desc
index b84e7f9..a031a99 100644
--- a/t/tests/control-file-general/desc
+++ b/t/tests/control-file-general/desc
@@ -17,7 +17,7 @@ Test-For:
package-depends-on-itself
pre-depends-directly-on-multiarch-support
stronger-dependency-implies-weaker
- xs-vcs-header-in-debian-control
+ xs-vcs-field-in-debian-control
References: Debian Bug#30020, Debian Bug#409099, Debian Bug#516706,
Debian Bug#533202, Debian Bug#557971, Debian Bug#573399, Debian Bug#580494,
Debian Bug#657110
diff --git a/t/tests/control-file-general/tags b/t/tests/control-file-general/tags
index bfafaca..b46e912 100644
--- a/t/tests/control-file-general/tags
+++ b/t/tests/control-file-general/tags
@@ -8,7 +8,7 @@ I: control-file-general source: binary-control-field-duplicates-source field "ma
I: control-file-general source: debian-control-has-obsolete-dbg-package control-file-general-dbg
I: control-file-general source: duplicate-long-description control-file-general control-file-general-1 control-file-general-2 control-file-general-3 control-file-general-4 control-file-general-5 control-file-general-dbgsym control-file-general-dbg
I: control-file-general source: duplicate-short-description control-file-general control-file-general-1
-I: control-file-general source: xs-vcs-header-in-debian-control xs-vcs-svn
+I: control-file-general source: xs-vcs-field-in-debian-control xs-vcs-svn
W: control-file-general source: control-file-contains-dh_make-vcs-comment
W: control-file-general source: dbg-package-missing-depends control-file-general-dbg
W: control-file-general source: debian-control-repeats-field-name-in-value line 101
diff --git a/t/tests/control-has-empty-field/desc b/t/tests/control-has-empty-field/desc
index 687f5af..cf0bac8 100644
--- a/t/tests/control-has-empty-field/desc
+++ b/t/tests/control-has-empty-field/desc
@@ -3,5 +3,5 @@ Version: 1.0
Options: -I -E --pedantic
Description: Check for empty fields
Test-For:
- co-maintained-package-with-no-vcs-headers
+ co-maintained-package-with-no-vcs-fields
debian-control-has-empty-field
diff --git a/t/tests/control-has-empty-field/tags b/t/tests/control-has-empty-field/tags
index 80c26e6..6213a58 100644
--- a/t/tests/control-has-empty-field/tags
+++ b/t/tests/control-has-empty-field/tags
@@ -1,3 +1,3 @@
-P: control-has-empty-field source: co-maintained-package-with-no-vcs-headers
+P: control-has-empty-field source: co-maintained-package-with-no-vcs-fields
P: control-has-empty-field source: debian-control-has-empty-field field "suggests" in package control-has-empty-field
P: control-has-empty-field source: debian-control-has-empty-field field "vcs-browser" in source paragraph
diff --git a/t/tests/fields-co-maintained-package-with-no-vcs-headers/debian/debian/control.in b/t/tests/fields-co-maintained-package-with-no-vcs-headers/debian/debian/control.in
deleted file mode 100644
index 03f40bb..0000000
--- a/t/tests/fields-co-maintained-package-with-no-vcs-headers/debian/debian/control.in
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: {$source}
-Priority: optional
-Section: {$section}
-Maintainer: {$author}
-Uploaders: Another Lintian Maintainer <foo@debian.org>
-Standards-Version: {$standards_version}
-Build-Depends: {$build_depends}
-Rules-Requires-Root: no
-Homepage: https://lintian.debian.org/
-
-Package: {$source}
-Architecture: {$architecture}
-Depends: $\{misc:Depends\}
-Description: {$description}
- This is a test package designed to exercise some feature or tag of
- Lintian. It is part of the Lintian test suite and may do very odd
- things. It should not be installed like a regular package. It may
- be an empty package.
diff --git a/t/tests/fields-co-maintained-package-with-no-vcs-headers/desc b/t/tests/fields-co-maintained-package-with-no-vcs-headers/desc
deleted file mode 100644
index 783b28b..0000000
--- a/t/tests/fields-co-maintained-package-with-no-vcs-headers/desc
+++ /dev/null
@@ -1,7 +0,0 @@
-Testname: fields-co-maintained-package-with-no-vcs-headers
-Version: 1.0
-Description: Check for co-maintained packages with no VCS headers
-Options: -I -E --pedantic
-Skeleton: pedantic
-Test-For:
- co-maintained-package-with-no-vcs-headers
diff --git a/t/tests/fields-co-maintained-package-with-no-vcs-headers/tags b/t/tests/fields-co-maintained-package-with-no-vcs-headers/tags
deleted file mode 100644
index 67c6ea5..0000000
--- a/t/tests/fields-co-maintained-package-with-no-vcs-headers/tags
+++ /dev/null
@@ -1 +0,0 @@
-P: fields-co-maintained-package-with-no-vcs-headers source: co-maintained-package-with-no-vcs-headers
diff --git a/t/tests/legacy-binary/desc b/t/tests/legacy-binary/desc
index 1e6f661..afc77e9 100644
--- a/t/tests/legacy-binary/desc
+++ b/t/tests/legacy-binary/desc
@@ -25,7 +25,7 @@ Test-For:
depends-on-metapackage
description-contains-homepage
desktop-command-not-in-package
- desktop-contains-deprecated-header
+ desktop-contains-deprecated-key
desktop-entry-contains-encoding-key
desktop-entry-contains-unknown-key
desktop-entry-file-has-crs
@@ -92,6 +92,6 @@ Test-For:
unquoted-string-in-menu-item
unstripped-binary-or-object
vcs-field-uses-insecure-uri
- xs-vcs-header-in-debian-control
+ xs-vcs-field-in-debian-control
Test-Against:
arch-dep-package-has-big-usr-share
diff --git a/t/tests/legacy-binary/tags b/t/tests/legacy-binary/tags
index 5f6ea11..ff1a913 100644
--- a/t/tests/legacy-binary/tags
+++ b/t/tests/legacy-binary/tags
@@ -49,7 +49,7 @@ E: binary: unstripped-binary-or-object usr/bin/hello
I: binary source: binary-control-field-duplicates-source field "vcs-svn" in package binary
I: binary source: vcs-field-uses-insecure-uri vcs-browser http://svn.wolffelaar.nl/lintian/trunk
I: binary source: vcs-field-uses-insecure-uri vcs-svn http://svn.wolffelaar.nl/lintian/trunk
-I: binary source: xs-vcs-header-in-debian-control xs-vcs-browser
+I: binary source: xs-vcs-field-in-debian-control xs-vcs-browser
I: binary-data: capitalization-error-in-description subversion Subversion
I: binary: binary-has-unneeded-section usr/bin/hello-static .comment
I: binary: capitalization-error-in-description debian Debian
@@ -86,7 +86,7 @@ W: binary: command-in-menu-file-and-desktop-file hello usr/share/menu/binary:5
W: binary: debian-news-entry-has-strange-distribution UNRELEASED
W: binary: description-contains-homepage
W: binary: desktop-command-not-in-package usr/share/applications/goodbye.desktop goodbye
-W: binary: desktop-contains-deprecated-header usr/share/applications/hello.desktop:4
+W: binary: desktop-contains-deprecated-key usr/share/applications/hello.desktop:4
W: binary: desktop-entry-contains-unknown-key usr/share/applications/goodbye.desktop:5 SpecialTag
W: binary: desktop-entry-contains-unknown-key usr/share/applications/goodbye.desktop:7 icon
W: binary: desktop-entry-file-has-crs usr/share/applications/hello.desktop:7
diff --git a/t/tests/source-copyright-license-header/debian/README b/t/tests/source-copyright-license-header/debian/README
deleted file mode 100644
index 1a9d2ad..0000000
--- a/t/tests/source-copyright-license-header/debian/README
+++ /dev/null
@@ -1 +0,0 @@
-trivial
diff --git a/t/tests/source-copyright-license-header/debian/debian/copyright b/t/tests/source-copyright-license-header/debian/debian/copyright
deleted file mode 100644
index 5db0fd8..0000000
--- a/t/tests/source-copyright-license-header/debian/debian/copyright
+++ /dev/null
@@ -1,26 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Doohickey
-Upstream-Contact: J. Random Hacker <j.r.hacker@example.com>
-Source: http://examples.com/doohickey/source/
-License: public-domain
- some public-domain
-
-License: golf
- blah bla
- This should not trigger a dep5-file-paragraph-reference-header
- tag.
-
-Files: *
-Comment: An old false positive see #766118. This should instead
- trigger a dep5-file-paragraph-reference-header
-Copyright: 2014, somebody
-License: public-domain
-
-Files: debian/*
-Copyright: 2014, somebody1
-License: this-license
- this is a valid license short name
-
-Files: debian/compat
-Copyright: 2015, somebody2
-License: golf
diff --git a/t/tests/source-copyright-license-header/desc b/t/tests/source-copyright-license-header/desc
deleted file mode 100644
index 36239a7..0000000
--- a/t/tests/source-copyright-license-header/desc
+++ /dev/null
@@ -1,6 +0,0 @@
-Testname: source-copyright-license-header
-Version: 1.0
-Description: Test for license field referencing header
-Test-For:
- dep5-file-paragraph-references-header-paragraph
- global-files-wildcard-not-first-paragraph-in-dep5-copyright
diff --git a/t/tests/source-copyright-license-header/tags b/t/tests/source-copyright-license-header/tags
deleted file mode 100644
index a306a18..0000000
--- a/t/tests/source-copyright-license-header/tags
+++ /dev/null
@@ -1,2 +0,0 @@
-W: source-copyright-license-header source: dep5-file-paragraph-references-header-paragraph public-domain (paragraph at line 13)
-W: source-copyright-license-header source: global-files-wildcard-not-first-paragraph-in-dep5-copyright (paragraph at line 13)
diff --git a/t/tests/testsuite-unknown-suite/desc b/t/tests/testsuite-unknown-suite/desc
index 47faf54..8edc5ac 100644
--- a/t/tests/testsuite-unknown-suite/desc
+++ b/t/tests/testsuite-unknown-suite/desc
@@ -3,4 +3,4 @@ Version: 1.0
Description: Tests for unknown suite in the control being non-file
Test-For:
unknown-testsuite
- xs-testsuite-header-in-debian-control
+ xs-testsuite-field-in-debian-control
diff --git a/t/tests/testsuite-unknown-suite/tags b/t/tests/testsuite-unknown-suite/tags
index 0596451..df83ed2 100644
--- a/t/tests/testsuite-unknown-suite/tags
+++ b/t/tests/testsuite-unknown-suite/tags
@@ -1,2 +1,2 @@
-I: testsuite-unknown-suite source: xs-testsuite-header-in-debian-control xs-testsuite
+I: testsuite-unknown-suite source: xs-testsuite-field-in-debian-control xs-testsuite
W: testsuite-unknown-suite source: unknown-testsuite golf
diff --git a/t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/debian/debian/control.in b/t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/debian/debian/control.in
deleted file mode 100644
index 724aa6e..0000000
--- a/t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/debian/debian/control.in
+++ /dev/null
@@ -1,17 +0,0 @@
-Source: {$source}
-Priority: optional
-Section: {$section}
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: {$build_depends}
-Rules-Requires-Root: no
-Testsuite: autopkgtest
-
-Package: {$source}
-Architecture: {$architecture}
-Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
-Description: {$description}
- This is a test package designed to exercise some feature or tag of
- Lintian. It is part of the Lintian test suite and may do very odd
- things. It should not be installed like a regular package. It may
- be an empty package.
diff --git a/t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/debian/debian/tests/control b/t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/debian/debian/tests/control
deleted file mode 100644
index 19e2aee..0000000
--- a/t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/debian/debian/tests/control
+++ /dev/null
@@ -1 +0,0 @@
-Tests: test-1
diff --git a/t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/debian/debian/tests/test-1 b/t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/debian/debian/tests/test-1
deleted file mode 100644
index 039e4d0..0000000
--- a/t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/debian/debian/tests/test-1
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exit 0
diff --git a/t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/desc b/t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/desc
deleted file mode 100644
index 357ede5..0000000
--- a/t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/desc
+++ /dev/null
@@ -1,5 +0,0 @@
-Testname: testsuite-unnecessary-testsuite-autopkgtest-header
-Version: 1.0
-Description: Tests for unnecessary Testsuite header in debian/control
-Test-For:
- unnecessary-testsuite-autopkgtest-header
diff --git a/t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/tags b/t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/tags
deleted file mode 100644
index aa38683..0000000
--- a/t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/tags
+++ /dev/null
@@ -1 +0,0 @@
-W: testsuite-unnecessary-testsuite-autopkgtest-header source: unnecessary-testsuite-autopkgtest-header
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: