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

[SCM] Debian package checker branch, master, updated. 2.1.3-49-g4e913bc



The following commit has been merged in the master branch:
commit 4e913bcab4a5b1932afdf0b35c43965cd2d03763
Author: Russ Allbery <rra@debian.org>
Date:   Tue Dec 30 23:13:02 2008 -0800

    Diagnose packages with games not in section games
    
    * checks/files{,.desc}:
      + [RA] Packages whose executables are all in /usr/games should
        probably be in section games.  (Closes: #509147)

diff --git a/checks/files b/checks/files
index 76c5b21..b5a7341 100644
--- a/checks/files
+++ b/checks/files
@@ -962,6 +962,9 @@ if ($pkg_section =~ m,games$, and $games == 0 and $other > 0) {
 if ($pkg_section =~ m,games$, and $games > 0 and $other > 0) {
     tag "package-section-games-but-has-usr-bin";
 }
+if ($pkg_section !~ m,games$, and $games > 0 and $other == 0) {
+    tag 'games-package-should-be-section-games';
+}
 
 # Warn about empty directories, but ignore empty directories in /var (packages
 # create directories to hold dynamically created data) or /etc (configuration
diff --git a/checks/files.desc b/checks/files.desc
index c44c6ad..ca41c12 100644
--- a/checks/files.desc
+++ b/checks/files.desc
@@ -842,6 +842,13 @@ Info: This package is marked as part of the section games, but contains
  executables in <tt>/bin</tt> or <tt>/usr/bin/</tt>.  This can be intentional,
  but is usually a mistake.
 
+Tag: games-package-should-be-section-games
+Severity: normal
+Certainty: possible
+Info: All the executables in this package are in <tt>/usr/games</tt>, but
+ the package is not in section games.  This can be intentional but is
+ usually a mistake.
+
 Tag: package-contains-devhelp-file-without-symlink
 Severity: normal
 Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index a76a263..f54f2c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ lintian (2.1.4) UNRELEASED; urgency=low
       - copyright-with-old-dh-make-debian-copyright
       - desktop-mimetype-without-update-call
       - forbidden-postrm-interpreter
+      - games-package-should-be-section-games
       - preinst-interpreter-without-predepends
       - script-calls-init-script-directly
       - unknown-control-interpreter (split from unusual-interpreter)
@@ -45,6 +46,9 @@ lintian (2.1.4) UNRELEASED; urgency=low
       files that list filenames, which is not supported.  Based on a patch
       from Raphael Geissert.  (Closes: #480939)
     + [RA] If dh is used, require debhelper tokens in maintainer scripts.
+  * checks/files{,.desc}:
+    + [RA] Packages whose executables are all in /usr/games should
+      probably be in section games.  (Closes: #509147)
   * checks/menu-format{,.desc}:
     + [RA] If a *.desktop file contains a MimeType key, check that the
       postinst calls update-desktop-database.  (Closes: #488832)
diff --git a/t/tests/6000_files-games-section.desc b/t/tests/6000_files-games-section.desc
new file mode 100644
index 0000000..08969c5
--- /dev/null
+++ b/t/tests/6000_files-games-section.desc
@@ -0,0 +1,8 @@
+Testname: files-games-section
+Section: games
+Version: 1.0
+Description: Correct section for games packages
+Test-For:
+ games-package-should-be-section-games
+ package-section-games-but-contains-no-game
+ package-section-games-but-has-usr-bin
diff --git a/t/tests/fields-wrong-section/debian/debian/control.in b/t/tests/files-games-section/debian/debian/control.in
similarity index 92%
copy from t/tests/fields-wrong-section/debian/debian/control.in
copy to t/tests/files-games-section/debian/debian/control.in
index 9ecaf8b..39b68aa 100644
--- a/t/tests/fields-wrong-section/debian/debian/control.in
+++ b/t/tests/files-games-section/debian/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: {$author}
 Standards-Version: 3.8.0
 Build-Depends: debhelper (>= 7)
 
-Package: {$srcpkg}-doc
+Package: {$srcpkg}-both
 Architecture: {$architecture}
 Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
 Description: {$description}
@@ -13,7 +13,7 @@ Description: {$description}
  Lintian.  It is part of the Lintian test suite and may do very odd
  things.  It should not be installed like a regular package.
 
-Package: lib{$srcpkg}-dev
+Package: {$srcpkg}-good
 Architecture: {$architecture}
 Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
 Description: {$description}
@@ -21,7 +21,7 @@ Description: {$description}
  Lintian.  It is part of the Lintian test suite and may do very odd
  things.  It should not be installed like a regular package.
 
-Package: lib{$srcpkg}-perl
+Package: {$srcpkg}-no-games
 Architecture: {$architecture}
 Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
 Description: {$description}
@@ -29,7 +29,8 @@ Description: {$description}
  Lintian.  It is part of the Lintian test suite and may do very odd
  things.  It should not be installed like a regular package.
 
-Package: python-{$srcpkg}
+Package: {$srcpkg}-wrong
+Section: devel
 Architecture: {$architecture}
 Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
 Description: {$description}
diff --git a/t/tests/files-games-section/debian/debian/files-games-section-both.install b/t/tests/files-games-section/debian/debian/files-games-section-both.install
new file mode 100644
index 0000000..86aecc7
--- /dev/null
+++ b/t/tests/files-games-section/debian/debian/files-games-section-both.install
@@ -0,0 +1,2 @@
+shell-blaster usr/bin
+shell-blaster usr/games
diff --git a/t/tests/files-games-section/debian/debian/files-games-section-both.manpages b/t/tests/files-games-section/debian/debian/files-games-section-both.manpages
new file mode 100644
index 0000000..e4d1bd8
--- /dev/null
+++ b/t/tests/files-games-section/debian/debian/files-games-section-both.manpages
@@ -0,0 +1,2 @@
+shell-blaster.1
+shell-blaster.6
diff --git a/t/tests/files-games-section/debian/debian/files-games-section-good.install b/t/tests/files-games-section/debian/debian/files-games-section-good.install
new file mode 100644
index 0000000..d10f2ef
--- /dev/null
+++ b/t/tests/files-games-section/debian/debian/files-games-section-good.install
@@ -0,0 +1 @@
+shell-blaster usr/games
diff --git a/t/tests/files-games-section/debian/debian/files-games-section-good.manpages b/t/tests/files-games-section/debian/debian/files-games-section-good.manpages
new file mode 100644
index 0000000..835dfac
--- /dev/null
+++ b/t/tests/files-games-section/debian/debian/files-games-section-good.manpages
@@ -0,0 +1 @@
+shell-blaster.6
diff --git a/t/tests/files-games-section/debian/debian/files-games-section-no-games.install b/t/tests/files-games-section/debian/debian/files-games-section-no-games.install
new file mode 100644
index 0000000..8b29e1f
--- /dev/null
+++ b/t/tests/files-games-section/debian/debian/files-games-section-no-games.install
@@ -0,0 +1 @@
+shell-blaster usr/bin
diff --git a/t/tests/files-games-section/debian/debian/files-games-section-no-games.manpages b/t/tests/files-games-section/debian/debian/files-games-section-no-games.manpages
new file mode 100644
index 0000000..36e298a
--- /dev/null
+++ b/t/tests/files-games-section/debian/debian/files-games-section-no-games.manpages
@@ -0,0 +1 @@
+shell-blaster.1
diff --git a/t/tests/files-games-section/debian/debian/files-games-section-wrong.install b/t/tests/files-games-section/debian/debian/files-games-section-wrong.install
new file mode 100644
index 0000000..d10f2ef
--- /dev/null
+++ b/t/tests/files-games-section/debian/debian/files-games-section-wrong.install
@@ -0,0 +1 @@
+shell-blaster usr/games
diff --git a/t/tests/files-games-section/debian/debian/files-games-section-wrong.manpages b/t/tests/files-games-section/debian/debian/files-games-section-wrong.manpages
new file mode 100644
index 0000000..835dfac
--- /dev/null
+++ b/t/tests/files-games-section/debian/debian/files-games-section-wrong.manpages
@@ -0,0 +1 @@
+shell-blaster.6
diff --git a/t/tests/files-games-section/debian/shell-blaster b/t/tests/files-games-section/debian/shell-blaster
new file mode 100755
index 0000000..48f8d5d
--- /dev/null
+++ b/t/tests/files-games-section/debian/shell-blaster
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "I'll be a game when I grow up!"
diff --git a/t/tests/files-games-section/debian/shell-blaster.1 b/t/tests/files-games-section/debian/shell-blaster.1
new file mode 100644
index 0000000..a8fe203
--- /dev/null
+++ b/t/tests/files-games-section/debian/shell-blaster.1
@@ -0,0 +1,8 @@
+.TH SHELL-BLASTER 1 "2008-12-30"
+.SH "NAME"
+shell\-blaster \- A simple shell non\-game
+.SH "SYNOPSIS"
+.B shell\-blaster
+.SH "DESCRIPTION"
+.B shell\-blaster
+wants to be a game but isn't yet.
diff --git a/t/tests/files-games-section/debian/shell-blaster.6 b/t/tests/files-games-section/debian/shell-blaster.6
new file mode 100644
index 0000000..9d6bcef
--- /dev/null
+++ b/t/tests/files-games-section/debian/shell-blaster.6
@@ -0,0 +1,8 @@
+.TH SHELL-BLASTER 6 "2008-12-30"
+.SH "NAME"
+shell\-blaster \- A simple shell non\-game
+.SH "SYNOPSIS"
+.B shell\-blaster
+.SH "DESCRIPTION"
+.B shell\-blaster
+wants to be a game but isn't yet.
diff --git a/t/tests/files-games-section/tags b/t/tests/files-games-section/tags
new file mode 100644
index 0000000..f419c0f
--- /dev/null
+++ b/t/tests/files-games-section/tags
@@ -0,0 +1,3 @@
+E: files-games-section-no-games: package-section-games-but-contains-no-game
+W: files-games-section-both: package-section-games-but-has-usr-bin
+W: files-games-section-wrong: games-package-should-be-section-games

-- 
Debian package checker


Reply to: