[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.4.3-42-gdfa6336



The following commit has been merged in the master branch:
commit dfa6336f6d44ee69ab1619cef70c7d7fafba97d5
Author: Niels Thykier <niels@thykier.net>
Date:   Fri Dec 24 12:37:37 2010 +0100

    Added test for non-standard-toplevel-dir and file-in-unusual-dir
    in files-general.

diff --git a/t/COVERAGE b/t/COVERAGE
index c3ba494..f9390ef 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,4 +1,4 @@
-Last generated 2010-12-22
+Last generated 2010-12-24
 
 The following tags are not tested by the test suite:
 
@@ -287,7 +287,6 @@ files embedded-javascript-library
 files executable-is-not-world-readable
 files file-directly-in-usr-share
 files file-directly-in-usr-share-doc
-files file-in-unusual-dir
 files file-in-usr-lib-sgml
 files file-name-ends-in-whitespace
 files lengthy-symlink
@@ -296,7 +295,6 @@ files macos-resource-fork-file-in-package
 files non-standard-dir-perm
 files non-standard-executable-perm
 files non-standard-setuid-executable-perm
-files non-standard-toplevel-dir
 files package-contains-bts-control-dir
 files package-contains-devhelp-file-without-symlink
 files package-contains-hardlink
@@ -474,7 +472,6 @@ binary
   doc-base-unknown-section
   executable-not-elf-or-script
   file-directly-in-usr-share
-  file-in-unusual-dir
   file-name-ends-in-whitespace
   lengthy-symlink
   menu-command-not-in-package
@@ -580,7 +577,6 @@ filenames
   macos-ds-store-file-in-package
   macos-resource-fork-file-in-package
   non-standard-dir-perm
-  non-standard-toplevel-dir
   package-contains-bts-control-dir
   package-contains-devhelp-file-without-symlink
   package-contains-linda-override
diff --git a/t/tests/files-general/debian/debian/install b/t/tests/files-general/debian/debian/install
index dabd5b3..0e50eb3 100644
--- a/t/tests/files-general/debian/debian/install
+++ b/t/tests/files-general/debian/debian/install
@@ -10,3 +10,4 @@ lintian-lib.conf etc/ld.so.conf.d
 php-foo.ini etc/php5/conf.d
 types usr/share/mime
 mimeinfo.cache usr/share/applications
+file-in-new-top-level-dir new-top-level-dir/
diff --git a/t/tests/files-general/debian/file-in-new-top-level-dir b/t/tests/files-general/debian/file-in-new-top-level-dir
new file mode 100644
index 0000000..ae82d42
--- /dev/null
+++ b/t/tests/files-general/debian/file-in-new-top-level-dir
@@ -0,0 +1,2 @@
+Since an empty file triggers "empty-dir" tags; we might as well
+test file-in-unusual-dir together with non-standard-toplevel-dir.
diff --git a/t/tests/files-general/desc b/t/tests/files-general/desc
index 732ca23..3a83141 100644
--- a/t/tests/files-general/desc
+++ b/t/tests/files-general/desc
@@ -7,9 +7,11 @@ Test-For:
  dir-or-file-in-var-run
  duplicated-compressed-file
  executable-manpage
+ file-in-unusual-dir
  global-data-in-games-directory
  icon-size-and-directory-name-mismatch
  non-conf-file-in-modprobe.d
+ non-standard-toplevel-dir
  obsolete-comments-style-in-php-ini
  package-contains-empty-directory
  package-contains-info-dir-file
diff --git a/t/tests/files-general/tags b/t/tests/files-general/tags
index a05c103..668f40d 100644
--- a/t/tests/files-general/tags
+++ b/t/tests/files-general/tags
@@ -3,6 +3,7 @@ E: files-general: dir-or-file-in-var-run var/run/lintian/
 E: files-general: executable-manpage usr/share/man/man5/foo.5.gz
 E: files-general: global-data-in-games-directory usr/share/games/icons/hicolor/22x22/lintian-22x22.png
 E: files-general: non-conf-file-in-modprobe.d etc/modprobe.d/--lzma
+E: files-general: non-standard-toplevel-dir new-top-level-dir/
 E: files-general: package-contains-info-dir-file usr/share/info/dir.gz
 E: files-general: package-contains-mime-cache-file usr/share/mime/types
 E: files-general: package-contains-mimeinfo.cache-file usr/share/applications/mimeinfo.cache
@@ -12,6 +13,7 @@ E: files-general: stray-directory-in-manpage-directory usr/share/man/man1/random
 I: files-general: duplicated-compressed-file usr/share/doc/lintian/lintian-16x16.png.gz
 I: files-general: package-contains-empty-directory usr/share/man/man1/random/
 W: files-general: executable-not-elf-or-script ./usr/share/man/man5/foo.5.gz
+W: files-general: file-in-unusual-dir new-top-level-dir/file-in-new-top-level-dir
 W: files-general: icon-size-and-directory-name-mismatch usr/share/apps/lintian/icons/hicolor/22x22/lintian-16x16.png 16x16
 W: files-general: obsolete-comments-style-in-php-ini etc/php5/conf.d/php-foo.ini
 W: files-general: windows-devel-file-in-package usr/lib/foo/foo.vcproj

-- 
Debian package checker


Reply to: