lintian: r594 - in trunk: checks debian

[rra@debian.org]

Author: rra
Date: 2006-03-29 07:26:22 +0200 (Wed, 29 Mar 2006)
New Revision: 594

Modified:
   trunk/checks/common_data.pm
   trunk/checks/fields
   trunk/checks/fields.desc
   trunk/debian/changelog
Log:
  * checks/common_data.pm:
    + [RA] Include a list of known X metapackages.
  * checks/fields{.desc,}:
    + [RA] Catch build dependencies on X metapackages, based on a patch by
      Josh Triplett.  (Partially addresses #347169)


Modified: trunk/checks/common_data.pm
===================================================================
--- trunk/checks/common_data.pm	2006-03-29 05:11:34 UTC (rev 593)
+++ trunk/checks/common_data.pm	2006-03-29 05:26:22 UTC (rev 594)
@@ -7,7 +7,8 @@
 	   %known_obsolete_fields %known_essential %known_build_essential
 	   %known_obsolete_packages %known_virtual_packages
 	   %known_libstdcs %known_tcls %known_tclxs %known_tks %known_tkxs
-	   %known_libpngs %non_standard_archs %all_cpus %all_oses
+	   %known_libpngs %known_x_metapackages
+	   %non_standard_archs %all_cpus %all_oses
           );
 
 # simple defines for commonly needed data
@@ -141,4 +142,8 @@
 %known_libpngs = map { $_ => 1 }
     ( 'libpng12-0', 'libpng2', 'libpng3', );
 
+%known_x_metapackages = map { $_ => 1 }
+    ( 'x-window-system', 'x-window-system-dev', 'x-window-system-core',
+      'xorg', );
+
 1;

Modified: trunk/checks/fields
===================================================================
--- trunk/checks/fields	2006-03-29 05:11:34 UTC (rev 593)
+++ trunk/checks/fields	2006-03-29 05:26:22 UTC (rev 594)
@@ -508,6 +508,9 @@
 					tag "build-depends-on-obsolete-package", "$field: $part_d_orig"
 					    if ($known_obsolete_packages{$d_pkg} && &$is_dep_field($field));
 
+					tag "build-depends-on-x-metapackage", "$field: $part_d_orig"
+					    if ($known_x_metapackages{$d_pkg} && &$is_dep_field($field));
+
 					tag "bad-relation", "$field: $part_d_orig"
 					    if $rest;
 				}

Modified: trunk/checks/fields.desc
===================================================================
--- trunk/checks/fields.desc	2006-03-29 05:11:34 UTC (rev 593)
+++ trunk/checks/fields.desc	2006-03-29 05:26:22 UTC (rev 594)
@@ -354,6 +354,14 @@
 Type: error
 Info: The package build-depends on a package that has been superseded.
 
+Tag: build-depends-on-x-metapackage
+Type: error
+Info: Packages must not build-depend on X Window System metapackages.
+ .
+ The metapackages xorg, x-window-system, x-window-system-dev, and
+ x-window-system-core exist only for the benefit of users and should not
+ be used in package build dependencies.
+
 Tag: depends-on-essential-package-without-using-version
 Type: error
 Ref: policy 3.5

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-03-29 05:11:34 UTC (rev 593)
+++ trunk/debian/changelog	2006-03-29 05:26:22 UTC (rev 594)
@@ -3,15 +3,17 @@
   * checks/common_data.pm:
     + [RA] Include all combinations of cpu and os from the dpkg cputable
       and ostable files (as of dpkg 1.13.16).  (Closes: #337034, #357433)
+    + [RA] Include a list of known X metapackages.
   * checks/debdiff{.desc,}:
     + [RA] Warn if the diff contains debian/substvars.  Based on a patch
       by Michael Ablassmeier.  (Closes: #359646)
-  * checks/fields:
+  * checks/fields{.desc,}:
     + [RA] Allow dpatch in Build-Depends for arch-independent packages if
       it is invoked in clean, build-arch, or binary-arch.
-  * checks/fields.desc:
     + [RA] Only list examples of non-standard architectures, since there
       are now too many combinations to list completely.
+    + [RA] Catch build dependencies on X metapackages, based on a patch by
+      Josh Triplett.  (Partially addresses #347169)
 
  -- Russ Allbery <rra@debian.org>  Sun, 26 Mar 2006 16:16:55 -0800