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

[lintian] 02/02: c/files: image in usr/lib is now pedantic



This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository lintian.

commit 965904e8717a1563e8ec6307f815039faa64ae82
Author: Niels Thykier <niels@thykier.net>
Date:   Fri Jan 22 20:01:05 2016 +0000

    c/files: image in usr/lib is now pedantic
    
    Signed-off-by: Niels Thykier <niels@thykier.net>
---
 checks/files.desc                            | 4 ++--
 debian/changelog                             | 2 ++
 t/tests/files-foo-in-bar/debian/debian/rules | 2 +-
 t/tests/files-foo-in-bar/desc                | 2 ++
 t/tests/files-foo-in-bar/tags                | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/checks/files.desc b/checks/files.desc
index 465c9e7..b5db3de 100644
--- a/checks/files.desc
+++ b/checks/files.desc
@@ -376,11 +376,11 @@ Info: Files in the <tt>/etc/emacs*</tt> directories should not be marked
  executable.
 
 Tag: image-file-in-usr-lib
-Severity: normal
+Severity: pedantic
 Certainty: certain
 Info: This package installs a pixmap or a bitmap within <tt>/usr/lib</tt>.
  According to the Filesystem Hierarchy Standard, architecture-independent
- files need to be placed within <tt>/usr/share</tt> instead.
+ files should to be placed within <tt>/usr/share</tt> instead.
 
 Tag: file-directly-in-usr-share-doc
 Severity: serious
diff --git a/debian/changelog b/debian/changelog
index c7d8d5d..650ade2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ lintian (2.5.40) UNRELEASED; urgency=medium
   * checks/files.pm:
     + [NT] Fix off-by-one in an "mtime" comparison, which could give
       false-positive package-contains-timestamped-gzip warnings.
+    + [NT] Downgrade image-file-in-usr-lib to pedantic given the
+      policy has relaxed on this point.  (Closes: #415558)
   * checks/source-copyright.{desc,pm}:
     + [JW] Apply patch from Mattia Rizzolo to update the machine-readable
       copyright format specification URL.  (Closes: #809248)
diff --git a/t/tests/files-foo-in-bar/debian/debian/rules b/t/tests/files-foo-in-bar/debian/debian/rules
index b72bd70..69a61df 100755
--- a/t/tests/files-foo-in-bar/debian/debian/rules
+++ b/t/tests/files-foo-in-bar/debian/debian/rules
@@ -14,5 +14,5 @@ override_dh_auto_build:
 override_dh_auto_install:
 	dh_install bar.1.gz usr/X11R6/man/man1/
 
+# skip
 override_dh_usrlocal override_dh_gconf:
-	# skip
diff --git a/t/tests/files-foo-in-bar/desc b/t/tests/files-foo-in-bar/desc
index b759d38..59dadf5 100644
--- a/t/tests/files-foo-in-bar/desc
+++ b/t/tests/files-foo-in-bar/desc
@@ -2,6 +2,8 @@ Testname: files-foo-in-bar
 Sequence: 6000
 Version: 1.0
 Description: Test tags about files or dirs in given paths
+Options: -I -E --pedantic
+Skeleton: pedantic
 Test-For:
  dir-in-usr-local
  dir-or-file-in-build-tree
diff --git a/t/tests/files-foo-in-bar/tags b/t/tests/files-foo-in-bar/tags
index 4bbde7d..87b3bc4 100644
--- a/t/tests/files-foo-in-bar/tags
+++ b/t/tests/files-foo-in-bar/tags
@@ -70,6 +70,7 @@ 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
+P: files-foo-in-bar: image-file-in-usr-lib usr/lib/files-foo-in-bar/bar.png
 W: files-foo-in-bar: debug-package-should-be-named-dbg usr/lib/debug/bar
 W: files-foo-in-bar: executable-not-elf-or-script bin/foo/bar
 W: files-foo-in-bar: executable-not-elf-or-script usr/bin/foo/bar
@@ -81,7 +82,6 @@ W: files-foo-in-bar: file-in-unusual-dir var/foo/bar
 W: files-foo-in-bar: file-in-unusual-dir var/lock/foo/bar
 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-multi-arch-lib-dir lib32/
 W: files-foo-in-bar: non-multi-arch-lib-dir lib64/
 W: files-foo-in-bar: non-multi-arch-lib-dir libx32/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: