[SCM] Debian package checker branch, master, updated. 2.5.1-177-g4769b77
The following commit has been merged in the master branch:
commit 4769b77d53bce24d49621bbdd372c5532f0e8dd2
Author: Niels Thykier <niels@thykier.net>
Date: Thu Aug 4 00:08:31 2011 +0200
Added test for .xvpics dirs and stricten the check
diff --git a/checks/files b/checks/files
index 396d926..7ed88d2 100644
--- a/checks/files
+++ b/checks/files
@@ -1151,7 +1151,7 @@ foreach my $file (@{$info->sorted_index}) {
if ($file =~ m,/\.(?:be|ditrack)/?$,) {
tag 'package-contains-bts-control-dir', $file;
}
- if ($file =~ m,/.xvpics/?$,) {
+ if ($file =~ m,/\.xvpics/?$,) {
tag 'package-contains-xvpics-dir', $file;
}
if ($file =~ m,usr/share/doc/[^/]+/examples/examples/?$,) {
diff --git a/debian/changelog b/debian/changelog
index 73fab96..d69c7bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -101,6 +101,7 @@ lintian (2.5.2) UNRELEASED; urgency=low
+ [NT] Accepted patch from Marcelo Jorge Vieira to catch
four additional embedded javascript libraries.
(Closes: #635447)
+ + [NT] Stricten the regex for finding .xvpics dirs.
* checks/init.d{,.desc}:
+ [NT] Provide a separate tag for upstart-jobs not registered
via update-rc.d in postinst. This allows vendors (such as
diff --git a/t/COVERAGE b/t/COVERAGE
index 588cf7f..bc886b8 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
Last generated 2011-08-03
-Coverage: 683/914 (74.73%), w. legacy tests: 811/914 (88.73%)
+Coverage: 684/914 (74.84%), w. legacy tests: 812/914 (88.84%)
The following tags are not tested by the test suite:
@@ -61,7 +61,6 @@ files nfs-temporary-file-in-package
files non-standard-file-permissions-for-etc-init.d-script
files old-app-defaults-directory
files old-style-example-dir
-files package-contains-xvpics-dir
files package-installs-font-to-usr-x11r6
files package-installs-perllocal-pod
files package-uses-obsolete-file
diff --git a/t/tests/files-foo-in-bar/debian/debian/install b/t/tests/files-foo-in-bar/debian/debian/install
index 6205714..56b448b 100644
--- a/t/tests/files-foo-in-bar/debian/debian/install
+++ b/t/tests/files-foo-in-bar/debian/debian/install
@@ -14,6 +14,7 @@ bar usr/lib/site-python/foo
bar usr/local/foo
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/X11R6/bin
bar var/foo
diff --git a/t/tests/files-foo-in-bar/desc b/t/tests/files-foo-in-bar/desc
index 49d20c7..5f17471 100644
--- a/t/tests/files-foo-in-bar/desc
+++ b/t/tests/files-foo-in-bar/desc
@@ -16,6 +16,7 @@ Test-For:
file-in-usr-lib-sgml
file-in-usr-lib-site-python
file-in-usr-local
+ package-contains-xvpics-dir
package-installs-file-to-usr-x11r6
package-installs-file-to-usr-x11r6-bin
package-installs-into-etc-rc.boot
diff --git a/t/tests/files-foo-in-bar/tags b/t/tests/files-foo-in-bar/tags
index c40f6a9..ebd5bde 100644
--- a/t/tests/files-foo-in-bar/tags
+++ b/t/tests/files-foo-in-bar/tags
@@ -20,6 +20,7 @@ E: files-foo-in-bar: file-in-usr-lib-site-python usr/lib/site-python/foo/bar
E: files-foo-in-bar: file-in-usr-local usr/local/foo/bar
E: files-foo-in-bar: nested-examples-directory usr/share/doc/files-foo-in-bar/examples/examples/
E: files-foo-in-bar: non-standard-dir-in-var var/foo/
+E: files-foo-in-bar: package-contains-xvpics-dir usr/share/doc/files-foo-in-bar/.xvpics/
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/man/
E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/man/man1/
--
Debian package checker
Reply to: