lintian: r862 - in trunk: checks debian

[rra@debian.org]

Author: rra
Date: 2007-04-27 04:35:36 +0200 (Fri, 27 Apr 2007)
New Revision: 862

Modified:
   trunk/checks/files
   trunk/debian/changelog
Log:
  + [RA] Use $pkg rather than reading fields/package for the x11-common
    pre-depend check.
  + [RA] Allow x11-common to install /usr/X11R6/bin.

Modified: trunk/checks/files
===================================================================
--- trunk/checks/files	2007-04-27 02:05:53 UTC (rev 861)
+++ trunk/checks/files	2007-04-27 02:35:36 UTC (rev 862)
@@ -240,32 +240,25 @@
 	#----------------- /usr/{include,lib}/X11/
 	# Packages installing files here must pre-depend on x11-common
 	# so that the symlinks will be sorted out first.
-	elsif ($file =~ m,^usr/(?:include|lib)/X11/, && !$warned_x11_predepends) {
-	    if (open (FH, "fields/package")) {
-		my $name = <FH>;
+	elsif ($file =~ m,^usr/(?:include|lib)/X11/,
+	       && !$warned_x11_predepends && $pkg ne 'x11-common') {
+	    my $pre_depends = '';
+	    if (open (FH, "fields/pre-depends")) {
+		$pre_depends = <FH>;
 		close FH;
-		$name =~ s/\n//g;
-		if ($name ne 'x11-common') {
-		    my $pre_depends = '';
-		    if (open (FH, "fields/pre-depends")) {
-			$pre_depends = <FH>;
-			close FH;
-			$pre_depends =~ s/\n//g;
-		    }
-		    $pre_depends = Dep::parse($pre_depends);
-		    tag "file-in-usr-something-x11-without-pre-depends", "$file"
-			unless Dep::implies($pre_depends, Dep::parse('x11-common (>= 1:7.0.0)'));
-		}
+		$pre_depends =~ s/\n//g;
 	    }
+	    $pre_depends = Dep::parse($pre_depends);
+	    tag "file-in-usr-something-x11-without-pre-depends", "$file"
+		unless Dep::implies($pre_depends, Dep::parse('x11-common (>= 1:7.0.0)'));
 
 	    # Always set this so that we don't redo the check, even if we
 	    # didn't warn.  If the first instance didn't warn, none will.
 	    $warned_x11_predepends = 1;
 	}
 
-
 	#----------------- /usr/X11R6/
-	elsif ($file =~ m,^usr/X11R6/bin,) {
+	elsif ($file =~ m,^usr/X11R6/bin, && $pkg ne 'x11-common') {
 	    tag "package-installs-file-to-usr-x11r6-bin", "$file";
 	}
 	elsif ($file =~ m,^usr/X11R6/lib/X11/fonts,) {

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-04-27 02:05:53 UTC (rev 861)
+++ trunk/debian/changelog	2007-04-27 02:35:36 UTC (rev 862)
@@ -20,6 +20,9 @@
     + [RA] Check for svk commit message files.
     + [RA] Don't consider {copying,license}.dtd extra license files; the
       Mozilla suite uses them for non-licenses.  (Closes: #420558)
+    + [RA] Use $pkg rather than reading fields/package for the x11-common
+      pre-depend check.
+    + [RA] Allow x11-common to install /usr/X11R6/bin.
   * checks/md5sums:
     + [RA] Don't warn about a missing md5sums file if the package contains
       nothing for which we would generate an MD5 checksum.  Thanks,
@@ -44,7 +47,7 @@
     + [RA] Diagnose use of /bin/env with a more specific message than the
       generic unusual interpreter tag.
 
- -- Russ Allbery <rra@debian.org>  Thu, 26 Apr 2007 19:05:43 -0700
+ -- Russ Allbery <rra@debian.org>  Thu, 26 Apr 2007 19:26:18 -0700
 
 lintian (1.23.29) unstable; urgency=low