[SCM] Debian package checker branch, master, updated. 2.5.2-100-g0c799e2
The following commit has been merged in the master branch:
commit 0c799e2bc36f097f1ee1c0473402d11f761adc5e
Author: Jakub Wilk <jwilk@debian.org>
Date: Mon Sep 5 15:28:53 2011 +0200
Check for Vim addons installing files into the Vim runtime path
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/files b/checks/files
index 881e3ed..22c57f4 100644
--- a/checks/files
+++ b/checks/files
@@ -562,6 +562,13 @@ foreach my $file (@{$info->sorted_index}) {
elsif ($file =~ m,^usr/share/mime/[^/]+$,) {
tag 'package-contains-mime-cache-file', $file;
}
+ # ---------------- /usr/share/vim
+ elsif ($file =~ m,^usr/share/vim/vim(?:current|\d{2})/([^/]++),) {
+ my $is_vimhelp = $1 eq 'doc' && $pkg =~ m,^vimhelp-\w++$,;
+ my $is_vim = $source_pkg =~ m,vim,;
+ tag 'vim-addon-within-vim-runtime-path', $file
+ unless $is_vim or $is_vimhelp;
+ }
# ---------------- /usr/share
elsif ($file =~ m,^usr/share/[^/]+$,) {
if ($index_info->{type} =~ m/^[-h]/) {
diff --git a/checks/files.desc b/checks/files.desc
index 66bab39..932bea9 100644
--- a/checks/files.desc
+++ b/checks/files.desc
@@ -1288,3 +1288,10 @@ Info: The package is not marked architecture all, but all the files it
is a chance that the package is missing files.
Ref: policy 5.6.8
+Tag: vim-addon-within-vim-runtime-path
+Severity: normal
+Certainty: certain
+Info: Vim addons should not be installed directly under a directory contained
+ in the Vim runtime path. Users shall be given the freedom to choose which
+ addons they want to have enabled and which they don't.
+Ref: vim-policy 3.1
diff --git a/debian/changelog b/debian/changelog
index ff7c805..c427130 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ lintian (2.5.3) UNRELEASED; urgency=low
- unknown-paragraph-in-dep5-copyright
- unused-license-paragraph-in-dep5-copyright
- unversioned-copyright-format-uri
+ - vim-addon-within-vim-runtime-path
- wiki-copyright-format-uri
+ Removed:
- debian-changelog-file-contains-debmake-default-email-address
@@ -87,6 +88,8 @@ lintian (2.5.3) UNRELEASED; urgency=low
from python{,3}-{stdlib-extensions,profiler,old-doctools} sources.
Add reference to Python Policy in the tag description.
(Closes: #640211)
+ + [JW] Add check for Vim addons installing files into a directory
+ within Vim runtime path. (Closes: #640371)
* checks/menus.desc:
+ [NT] Added reference to the doc-base manual to help people
find the list of valid doc-base sections. (Closes: #584280)
diff --git a/private/refresh-manual-refs b/private/refresh-manual-refs
index 79ccf8c..1a1a86f 100755
--- a/private/refresh-manual-refs
+++ b/private/refresh-manual-refs
@@ -88,6 +88,11 @@ my %manuals = (
'http://www.debian.org/doc/packaging-manuals/java-policy/',
$dbk_index_re, $dbk_fields
],
+ 'vim-policy' => [
+ '/usr/share/doc/vim-doc/vim-policy.html/index.html',
+ 'http://pkg-vim.alioth.debian.org/vim-policy.html/',
+ $dbk_index_re, $dbk_fields
+ ],
'lintian' => [
'/usr/share/doc/lintian/lintian.html/index.html',
'http://lintian.debian.org/manual/',
diff --git a/t/COVERAGE b/t/COVERAGE
index cd021e4..b2a2f5c 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
-Last generated 2011-09-02
-Coverage: 716/933 (76.74%), w. legacy tests: 838/933 (89.82%)
+Last generated 2011-09-04
+Coverage: 719/934 (76.98%), w. legacy tests: 841/934 (90.04%)
The following tags are not tested by the test suite:
@@ -56,9 +56,7 @@ files old-style-example-dir
files package-installs-font-to-usr-x11r6
files package-installs-perllocal-pod
files package-uses-obsolete-file
-files perl-module-in-core-directory
files special-file
-files third-party-package-in-python-dir
files udeb-contains-documentation-file
init.d duplicate-updaterc.d-calls-in-postinst
diff --git a/t/tests/files-foo-in-bar/debian/debian/install b/t/tests/files-foo-in-bar/debian/debian/install
index d536bae..e92bc29 100644
--- a/t/tests/files-foo-in-bar/debian/debian/install
+++ b/t/tests/files-foo-in-bar/debian/debian/install
@@ -9,6 +9,8 @@ bar tmp/foo
bar usr/bin/foo
bar usr/foo
bar usr/lib/debug/
+bar usr/lib/perl/
+bar usr/lib/python2.6/
bar usr/lib/sgml
bar usr/lib/site-python/foo
bar usr/local/foo
@@ -16,6 +18,9 @@ bar usr/share
bar usr/share/doc
bar usr/share/doc/files-foo-in-bar/.xvpics/
bar usr/share/doc/files-foo-in-bar/examples/examples
+bar usr/share/perl/
+bar usr/share/vim/vimcurrent/
+bar usr/share/vim/vim73/
bar usr/X11R6/bin
bar var/foo
bar var/lock/foo
diff --git a/t/tests/files-foo-in-bar/desc b/t/tests/files-foo-in-bar/desc
index 640ad48..ceb0adb 100644
--- a/t/tests/files-foo-in-bar/desc
+++ b/t/tests/files-foo-in-bar/desc
@@ -22,9 +22,12 @@ Test-For:
package-installs-file-to-usr-x11r6-bin
package-installs-into-etc-rc.boot
package-installs-into-etc-rc.d
+ perl-module-in-core-directory
+ perl-module-in-core-directory
nested-examples-directory
non-standard-dir-in-usr
non-standard-dir-in-var
subdir-in-bin
+ third-party-package-in-python-dir
udev-rule-in-etc
-
+ vim-addon-within-vim-runtime-path
diff --git a/t/tests/files-foo-in-bar/tags b/t/tests/files-foo-in-bar/tags
index 570eb66..40c1ffd 100644
--- a/t/tests/files-foo-in-bar/tags
+++ b/t/tests/files-foo-in-bar/tags
@@ -29,6 +29,8 @@ E: files-foo-in-bar: package-installs-file-to-usr-x11r6-bin usr/X11R6/bin/
E: files-foo-in-bar: package-installs-file-to-usr-x11r6-bin usr/X11R6/bin/bar
E: files-foo-in-bar: package-installs-into-etc-rc.boot etc/rc.boot/bar
E: files-foo-in-bar: package-installs-into-etc-rc.d etc/rc.d/bar
+E: files-foo-in-bar: perl-module-in-core-directory usr/lib/perl/bar
+E: files-foo-in-bar: perl-module-in-core-directory usr/share/perl/bar
E: files-foo-in-bar: subdir-in-bin bin/foo/
E: files-foo-in-bar: subdir-in-usr-bin usr/bin/foo/
E: files-foo-in-bar: udev-rule-in-etc etc/udev/rules.d/bar
@@ -43,3 +45,6 @@ W: files-foo-in-bar: file-in-unusual-dir var/run/foo/bar
W: files-foo-in-bar: file-in-usr-lib-sgml usr/lib/sgml/bar
W: files-foo-in-bar: image-file-in-usr-lib usr/lib/files-foo-in-bar/bar.png
W: files-foo-in-bar: non-standard-dir-in-usr usr/foo/
+W: files-foo-in-bar: third-party-package-in-python-dir usr/lib/python2.6/bar
+W: files-foo-in-bar: vim-addon-within-vim-runtime-path usr/share/vim/vim73/bar
+W: files-foo-in-bar: vim-addon-within-vim-runtime-path usr/share/vim/vimcurrent/bar
--
Debian package checker
Reply to: