[lintian] 02/03: c/menu-format: Retire old check for kdelnk files
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit ee7fe3ac88b451456a53f2f5168a88206e8ad915
Author: Niels Thykier <niels@thykier.net>
Date: Sat Oct 25 16:33:24 2014 +0200
c/menu-format: Retire old check for kdelnk files
The tag is no longer emitted. Furthermore, the last KDE 1 and 2
releases were over 12 years ago, so these files are unlikely to
reappear again.
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/menu-format.desc | 8 --------
checks/menu-format.pm | 5 -----
debian/changelog | 3 +++
t/COVERAGE | 4 +---
t/tests/legacy-binary/debian/debian/rules | 2 --
t/tests/legacy-binary/tags | 1 -
6 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/checks/menu-format.desc b/checks/menu-format.desc
index 1fd9ab2..9ee6c78 100644
--- a/checks/menu-format.desc
+++ b/checks/menu-format.desc
@@ -388,14 +388,6 @@ Info: The desktop entry lists support for at least one mime type, but does not
If the application can indeed handle files of the listed mime types, it should
specify a way to pass the filenames as parameters.
-Tag: deprecated-kdelnk-file
-Severity: important
-Certainty: certain
-Info: kdelnk files were used by KDE 1 and since KDE 2 desktop files are used
- instead. Renaming the file and removing the deprecated header and keys
- is often all that needs to be done.
-Ref: http://standards.freedesktop.org/desktop-entry-spec/1.0/apc.html
-
Tag: desktop-entry-limited-to-environments
Severity: normal
Certainty: wild-guess
diff --git a/checks/menu-format.pm b/checks/menu-format.pm
index 062d384..7f4c5b9 100644
--- a/checks/menu-format.pm
+++ b/checks/menu-format.pm
@@ -161,11 +161,6 @@ sub run {
}
}
- for my $file ($info->sorted_index) {
- tag 'deprecated-kdelnk-file', $file
- if ($file->basename =~ m,\.kdelnk$,);
- }
-
# Find the desktop files in the package for verification.
my @desktop_files;
for my $subdir (qw(applications xsessions)) {
diff --git a/debian/changelog b/debian/changelog
index 36c1e52..3007f8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ lintian (2.5.30) UNRELEASED; urgency=medium
XXX: generate tag summary with private/generate-tag-summary
+ * checks/menu-format.{desc,pm}:
+ + [NT] Retire check for "kdelnk" files.
+
* collection/unpacked:
+ [NT] Correct handling of files with 2 or more consecutive
backslashes.
diff --git a/t/COVERAGE b/t/COVERAGE
index e1fcecf..f928897 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
Last generated 2014-10-25
-Coverage (Tags): 1044/1114 (93.72%), w. legacy tests: 1102/1114 (98.92%)
+Coverage (Tags): 1044/1113 (93.80%), w. legacy tests: 1101/1113 (98.92%)
Coverage (Checks): 38/46 (82.61%), w. legacy tests: 40/46 (86.96%)
The following tags are not tested by the test suite:
@@ -49,7 +49,6 @@ 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 deprecated-kdelnk-file
menu-format desktop-contains-deprecated-header
menu-format desktop-entry-missing-required-key
menu-format menu-item-missing-required-tag
@@ -93,7 +92,6 @@ Breakdown of remaining tags in legacy test suite by test case:
binary
binary-has-unneeded-section
- deprecated-kdelnk-file
desktop-contains-deprecated-header
desktop-entry-missing-required-key
doc-base-document-field-ends-in-whitespace
diff --git a/t/tests/legacy-binary/debian/debian/rules b/t/tests/legacy-binary/debian/debian/rules
index a0b2d74..3057777 100755
--- a/t/tests/legacy-binary/debian/debian/rules
+++ b/t/tests/legacy-binary/debian/debian/rules
@@ -60,8 +60,6 @@ binary-arch: build
install -d $(tmp)/usr/share/applications
install -m 644 debian/hello.desktop \
$(tmp)/usr/share/applications/hello.desktop
- install -m 644 debian/hello.desktop \
- $(tmp)/usr/share/applications/hello.kdelnk
install -m 755 debian/goodbye.desktop \
$(tmp)/usr/share/applications/goodbye.desktop
diff --git a/t/tests/legacy-binary/tags b/t/tests/legacy-binary/tags
index a38a238..161eb6f 100644
--- a/t/tests/legacy-binary/tags
+++ b/t/tests/legacy-binary/tags
@@ -6,7 +6,6 @@ E: binary: debian-changelog-file-missing-or-wrong-name
E: binary: debian-copyright-file-uses-obsolete-national-encoding at line 13
E: binary: debian-news-file-uses-obsolete-national-encoding at line 3
E: binary: depends-on-metapackage pre-depends: xorg
-E: binary: deprecated-kdelnk-file usr/share/applications/hello.kdelnk
E: binary: desktop-entry-missing-required-key usr/share/applications/goodbye.desktop Name
E: binary: doc-base-document-field-ends-in-whitespace binary:1
E: binary: doc-base-file-duplicated-format binary:36 html
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: