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

[SCM] Debian package checker branch, master, updated. 2.2.14-24-g5dcfcca



The following commit has been merged in the master branch:
commit b43e6b873c37e33054471d3ff25c69bb9d6f3e2b
Author: Raphael Geissert <atomo64@gmail.com>
Date:   Sat Aug 29 19:12:45 2009 -0500

    Check for non-games-specific data under games subdirectory
    
    * checks/files{,.desc}:
      + [RA] Check for putting data that should be in /usr/share under
        /usr/share/games.  Patch from Raphael Geissert.  (Closes: #534486)

diff --git a/checks/files b/checks/files
index 4e662bc..e5d2815 100644
--- a/checks/files
+++ b/checks/files
@@ -494,6 +494,10 @@ foreach my $file (sort keys %{$info->index}) {
 	    tag 'icon-size-and-directory-name-mismatch', $file, $fsize
 		unless ($dsize eq $fsize);
 	}
+	# ---------------- non-games-specific data in games subdirectory
+	elsif ($file =~ m,^usr/share/games/(?:applications|mime|icons|pixmaps)/,) {
+	    tag "global-data-in-games-directory", $file;
+	}
     }
     # ---------------- /var subdirs
     elsif ($type ne 'udeb' and $file =~ m,^var/[^/]+/$,) { # FSSTND dirs
diff --git a/checks/files.desc b/checks/files.desc
index 4487cb5..f6dbcd7 100644
--- a/checks/files.desc
+++ b/checks/files.desc
@@ -1045,3 +1045,9 @@ Info: This package installs a file in <tt>/etc/ld.so.conf.d</tt>,
  to installing them into <tt>/usr/lib</tt> except now conflicting library
  packages may cause random segfaults and difficult-to-debug problems
  instead of conflicts in the package manager.
+
+Tag: global-data-in-games-directory
+Severity: important
+Certainty: certain
+Info: This package contains files in directories that belong to direct
+ subdirectories of <tt>/usr/share</tt> instead of <tt>/usr/share/games</tt>.
diff --git a/debian/changelog b/debian/changelog
index b59227c..b95d2cf 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ lintian (2.2.15) UNRELEASED; urgency=low
   * Summary of tag changes:
     + Added:
       - build-depends-on-non-build-package
+      - global-data-in-games-directory
   
   * checks/changelog-file:
     + [RA] Don't warn about a symlinked changelog file if the version
@@ -41,6 +42,8 @@ lintian (2.2.15) UNRELEASED; urgency=low
       the same check.
     + [RA] Add mootools.js to embedded-javascript-library.  Patch from
       Marcelo Jorge Vieira (metal).  (Closes: #545716)
+    + [RA] Check for putting data that should be in /usr/share under
+      /usr/share/games.  Patch from Raphael Geissert.  (Closes: #534486)
   * checks/manpages:
     + [ADB] Add HTTPS to the list of recognised protocols for URLs in manpages
       which should not cause manpage-has-errors-from-man to be emitted.
diff --git a/t/tests/files-general/debian/debian/install b/t/tests/files-general/debian/debian/install
index 149e873..4539338 100644
--- a/t/tests/files-general/debian/debian/install
+++ b/t/tests/files-general/debian/debian/install
@@ -1,5 +1,6 @@
 lintian-16x16.png usr/share/apps/lintian/icons/hicolor/22x22
 lintian-22x22.png usr/share/apps/lintian/icons/hicolor/22x22
+lintian-22x22.png usr/share/games/icons/hicolor/22x22
 --lzma etc/modprobe.d
 lintian.conf etc/modprobe.d
 dir usr/share/info
diff --git a/t/tests/files-general/desc b/t/tests/files-general/desc
index 5a57765..55bb04e 100644
--- a/t/tests/files-general/desc
+++ b/t/tests/files-general/desc
@@ -6,6 +6,7 @@ Test-For:
  dir-or-file-in-var-lock
  dir-or-file-in-var-run
  executable-manpage
+ global-data-in-games-directory
  icon-size-and-directory-name-mismatch
  non-conf-file-in-modprobe.d
  package-contains-empty-directory
diff --git a/t/tests/files-general/tags b/t/tests/files-general/tags
index 5ccd78b..ce1b027 100644
--- a/t/tests/files-general/tags
+++ b/t/tests/files-general/tags
@@ -1,6 +1,10 @@
 E: files-general: dir-or-file-in-var-lock var/lock/lintian/
 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/
+E: files-general: global-data-in-games-directory usr/share/games/icons/hicolor/
+E: files-general: global-data-in-games-directory usr/share/games/icons/hicolor/22x22/
+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: package-contains-info-dir-file usr/share/info/dir.gz
 E: files-general: package-modifies-ld.so-search-path etc/ld.so.conf.d/lintian-lib.conf

-- 
Debian package checker


Reply to: