[lintian] 01/02: Fix a few typos
This is an automated email from the git hooks/post-receive script.
broucaries-guest pushed a commit to branch master
in repository lintian.
commit ca528d3346e22c48e0d8fd66e01c9015cffea9bd
Author: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
Date: Sat Aug 8 19:04:44 2015 +0200
Fix a few typos
Signed-off-by: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
---
checks/files.desc | 8 ++++----
checks/files.pm | 8 ++++----
checks/source-copyright.desc | 2 +-
checks/source-copyright.pm | 2 +-
debian/changelog | 2 ++
t/tests/files-foo-in-bar/desc | 6 +++---
t/tests/files-foo-in-bar/tags | 14 +++++++-------
t/tests/files-ieee-data/desc | 2 +-
t/tests/files-ieee-data/tags | 8 ++++----
t/tests/source-copyright-license-header/desc | 2 +-
t/tests/source-copyright-license-header/tags | 2 +-
t/tests/source-copyright-unique/tags | 2 +-
12 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/checks/files.desc b/checks/files.desc
index ca283ec..d3bffa4 100644
--- a/checks/files.desc
+++ b/checks/files.desc
@@ -66,7 +66,7 @@ Info: The package installs files into the <tt>/etc/rc.d</tt> or
<tt>/etc/rc?.d</tt> which is not allowed.
Ref: policy 9.3.3
-Tag: package-install-ieee-data
+Tag: package-installs-ieee-data
Severity: important
Certainty: possible
Ref: #785662
@@ -78,7 +78,7 @@ Info: Debian package should not install ieee oui.txt or iab.txt file
/usr/share/ieee-data/oui.txt. Moreover, you should also
depends on ieee-data package.
-Tag: package-install-apt-preferences
+Tag: package-installs-apt-preferences
Severity: serious
Certainty: possible
Ref: apt_preferences(5)
@@ -87,7 +87,7 @@ Info: Debian packages should not install files under <tt>/etc/apt/preferences.d/
.
Package should not override local administrator choices.
-Tag: package-install-apt-sources
+Tag: package-installs-apt-sources
Severity: serious
Certainty: possible
Ref: sources.list(5)
@@ -104,7 +104,7 @@ Info: The package installs files in the <tt>/etc/rc.boot</tt> directory,
which is obsolete.
Ref: policy 9.3.4
-Tag: package-install-into-obsolete-dir
+Tag: package-installs-into-obsolete-dir
Severity: normal
Certainty: certain
Info: The package installs files to an obsolete directory.
diff --git a/checks/files.pm b/checks/files.pm
index ce90dfe..b816ed8 100644
--- a/checks/files.pm
+++ b/checks/files.pm
@@ -423,7 +423,7 @@ sub run {
my $oldpath = $obs_data->{'olddir'};
my $newpath = $obs_data->{'newdir'};
my $moreinfo = $obs_data->{'moreinfo'};
- tag 'package-install-into-obsolete-dir',
+ tag 'package-installs-into-obsolete-dir',
"$file : $oldpath -> $newpath (see also $moreinfo)";
}
}
@@ -435,7 +435,7 @@ sub run {
=~ m,/(?:[^/]-)?(?:oui|iab)(?:\.(txt|idx|db))?(?:\.$COMPRESS_FILE_EXTENSIONS_OR_ALL)?\Z,x
) {
unless ($source_pkg eq 'ieee-data') {
- tag 'package-install-ieee-data', $file;
+ tag 'package-installs-ieee-data', $file;
}
}
}
@@ -448,13 +448,13 @@ sub run {
# -----------------/etc/apt/preferences
if ($fname =~ m,^etc/apt/preferences(?:$|\.d/),) {
unless ($source_pkg eq 'apt') {
- tag 'package-install-apt-preferences', $file;
+ tag 'package-installs-apt-preferences', $file;
}
}
# -----------------/etc/apt/sources
if ($fname =~ m,^etc/apt/sources\.list(?:$|\.d/),) {
unless ($source_pkg eq 'apt') {
- tag 'package-install-apt-sources', $file;
+ tag 'package-installs-apt-sources', $file;
}
}
}
diff --git a/checks/source-copyright.desc b/checks/source-copyright.desc
index 37302f7..9e75ef7 100644
--- a/checks/source-copyright.desc
+++ b/checks/source-copyright.desc
@@ -240,7 +240,7 @@ Info: In contrast to package dependencies, the pipe symbol or vertical
between two license short names. Instead, the keyword "or" between
two license names indicates the dual licensing.
-Tag: dep5-file-paragraph-reference-header-paragraph
+Tag: dep5-file-paragraph-references-header-paragraph
Severity: normal
Certainty: possible
Ref: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
diff --git a/checks/source-copyright.pm b/checks/source-copyright.pm
index b81eb55..22508df 100644
--- a/checks/source-copyright.pm
+++ b/checks/source-copyright.pm
@@ -447,7 +447,7 @@ sub _parse_dep5 {
tag 'missing-license-paragraph-in-dep5-copyright', $license,
"(paragraph at line $lines[$i]{'START-OF-PARAGRAPH'})";
} elsif ($standalone_licenses{$license} == -1) {
- tag 'dep5-file-paragraph-reference-header-paragraph', $license,
+ tag 'dep5-file-paragraph-references-header-paragraph', $license,
"(paragraph at line $lines[$i]{'START-OF-PARAGRAPH'})";
}
diff --git a/debian/changelog b/debian/changelog
index e6e160d..15d78fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ lintian (2.5.36) UNRELEASED; urgency=medium
XXX: generate tag summary with private/generate-tag-summary
+ * checks/files.desc:
+ + [BR] Correct a few typos. (Closes: #794953).
* checks/scripts.desc:
+ [BR] Detect suspicious use of ln -s that could be replaced by
dpkg-maintscript-helper.
diff --git a/t/tests/files-foo-in-bar/desc b/t/tests/files-foo-in-bar/desc
index ac2a126..b759d38 100644
--- a/t/tests/files-foo-in-bar/desc
+++ b/t/tests/files-foo-in-bar/desc
@@ -26,12 +26,12 @@ Test-For:
package-contains-xvpics-dir
package-contains-thumbnails-dir
package-installs-file-to-usr-x11r6
- package-install-apt-preferences
- package-install-apt-sources
+ package-installs-apt-preferences
+ package-installs-apt-sources
package-installs-into-etc-gconf-schemas
package-installs-into-etc-rc.boot
package-installs-into-etc-rc.d
- package-install-into-obsolete-dir
+ package-installs-into-obsolete-dir
package-installs-nonbinary-perl-in-usr-lib-perl5
package-installs-perllocal-pod
package-installs-packlist
diff --git a/t/tests/files-foo-in-bar/tags b/t/tests/files-foo-in-bar/tags
index 650de90..0db69b9 100644
--- a/t/tests/files-foo-in-bar/tags
+++ b/t/tests/files-foo-in-bar/tags
@@ -32,11 +32,11 @@ E: files-foo-in-bar: package-contains-mime-file-outside-package-dir usr/share/mi
E: files-foo-in-bar: package-contains-mime-file-outside-package-dir usr/share/mime/foo/bar
E: files-foo-in-bar: package-contains-thumbnails-dir usr/share/doc/files-foo-in-bar/.thumbnails/
E: files-foo-in-bar: package-contains-xvpics-dir usr/share/doc/files-foo-in-bar/.xvpics/
-E: files-foo-in-bar: package-install-apt-preferences etc/apt/preferences
-E: files-foo-in-bar: package-install-apt-preferences etc/apt/preferences.d/
-E: files-foo-in-bar: package-install-apt-preferences etc/apt/preferences.d/bar
-E: files-foo-in-bar: package-install-apt-sources etc/apt/sources.list.d/
-E: files-foo-in-bar: package-install-apt-sources etc/apt/sources.list.d/bar
+E: files-foo-in-bar: package-installs-apt-preferences etc/apt/preferences
+E: files-foo-in-bar: package-installs-apt-preferences etc/apt/preferences.d/
+E: files-foo-in-bar: package-installs-apt-preferences etc/apt/preferences.d/bar
+E: files-foo-in-bar: package-installs-apt-sources etc/apt/sources.list.d/
+E: files-foo-in-bar: package-installs-apt-sources etc/apt/sources.list.d/bar
E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/
E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/bin/
E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/bin/bar
@@ -74,9 +74,9 @@ W: files-foo-in-bar: non-multi-arch-lib-dir usr/lib32/
W: files-foo-in-bar: non-multi-arch-lib-dir usr/lib64/
W: files-foo-in-bar: non-multi-arch-lib-dir usr/libx32/
W: files-foo-in-bar: non-standard-dir-in-usr usr/foo/
-W: files-foo-in-bar: package-install-into-obsolete-dir etc/dhcp3/ : ^etc/dhcp3/ -> etc/dhcp (see also https://bugs.debian.org/673029)
-W: files-foo-in-bar: package-install-into-obsolete-dir etc/dhcp3/bar : ^etc/dhcp3/ -> etc/dhcp (see also https://bugs.debian.org/673029)
W: files-foo-in-bar: package-installs-into-etc-gconf-schemas etc/gconf/schemas/bar
+W: files-foo-in-bar: package-installs-into-obsolete-dir etc/dhcp3/ : ^etc/dhcp3/ -> etc/dhcp (see also https://bugs.debian.org/673029)
+W: files-foo-in-bar: package-installs-into-obsolete-dir etc/dhcp3/bar : ^etc/dhcp3/ -> etc/dhcp (see also https://bugs.debian.org/673029)
W: files-foo-in-bar: package-installs-nonbinary-perl-in-usr-lib-perl5 usr/lib/perl5/Foo/Bar.pm
W: files-foo-in-bar: package-installs-perllocal-pod usr/lib/perl-foo/perllocal.pod
W: files-foo-in-bar: third-party-package-in-python-dir usr/lib/python2.7/bar
diff --git a/t/tests/files-ieee-data/desc b/t/tests/files-ieee-data/desc
index 34c0592..2078ac0 100644
--- a/t/tests/files-ieee-data/desc
+++ b/t/tests/files-ieee-data/desc
@@ -3,4 +3,4 @@ Sequence: 6000
Version: 1.0
Description: Check for different ieee data install
Test-For:
- package-install-ieee-data
+ package-installs-ieee-data
diff --git a/t/tests/files-ieee-data/tags b/t/tests/files-ieee-data/tags
index 9efd70c..6f3249a 100644
--- a/t/tests/files-ieee-data/tags
+++ b/t/tests/files-ieee-data/tags
@@ -1,5 +1,5 @@
-E: files-ieee-data: package-install-ieee-data usr/share/files-ieee-data/iab.idx
-E: files-ieee-data: package-install-ieee-data usr/share/files-ieee-data/oui.db
-E: files-ieee-data: package-install-ieee-data usr/share/files-ieee-data/oui.idx
-E: files-ieee-data: package-install-ieee-data usr/share/files-ieee-data/oui.txt.gz
+E: files-ieee-data: package-installs-ieee-data usr/share/files-ieee-data/iab.idx
+E: files-ieee-data: package-installs-ieee-data usr/share/files-ieee-data/oui.db
+E: files-ieee-data: package-installs-ieee-data usr/share/files-ieee-data/oui.idx
+E: files-ieee-data: package-installs-ieee-data usr/share/files-ieee-data/oui.txt.gz
X: files-ieee-data: package-contains-broken-symlink usr/share/files-ieee-data/iab.txt ../ieee-data/iab.txt
diff --git a/t/tests/source-copyright-license-header/desc b/t/tests/source-copyright-license-header/desc
index 32cbd32..f4031b5 100644
--- a/t/tests/source-copyright-license-header/desc
+++ b/t/tests/source-copyright-license-header/desc
@@ -3,4 +3,4 @@ Sequence: 6000
Version: 1.0
Description: Test for license field referencing header
Test-For:
- dep5-file-paragraph-reference-header-paragraph
+ dep5-file-paragraph-references-header-paragraph
diff --git a/t/tests/source-copyright-license-header/tags b/t/tests/source-copyright-license-header/tags
index 710e58d..4bb6a83 100644
--- a/t/tests/source-copyright-license-header/tags
+++ b/t/tests/source-copyright-license-header/tags
@@ -1 +1 @@
-W: source-copyright-license-header source: dep5-file-paragraph-reference-header-paragraph public-domain (paragraph at line 13)
+W: source-copyright-license-header source: dep5-file-paragraph-references-header-paragraph public-domain (paragraph at line 13)
diff --git a/t/tests/source-copyright-unique/tags b/t/tests/source-copyright-unique/tags
index 8086bdf..a954b57 100644
--- a/t/tests/source-copyright-unique/tags
+++ b/t/tests/source-copyright-unique/tags
@@ -1,4 +1,4 @@
W: source-copyright-unique source: dep5-copyright-license-name-not-unique (paragraph at line 27)
W: source-copyright-unique source: dep5-copyright-license-name-not-unique (paragraph at line 32)
W: source-copyright-unique source: dep5-copyright-license-name-not-unique (paragraph at line 35)
-W: source-copyright-unique source: dep5-file-paragraph-reference-header-paragraph some-license (paragraph at line 8)
+W: source-copyright-unique source: dep5-file-paragraph-references-header-paragraph some-license (paragraph at line 8)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: