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

[SCM] Debian package checker branch, master, updated. 2.2.13-50-gbd5784d



The following commit has been merged in the master branch:
commit e9ab40209654d3e39d4b61ac3afbf754d46b19de
Author: Russ Allbery <rra@debian.org>
Date:   Sat Aug 15 18:53:42 2009 -0700

    Remove x11-common pre-depends requirement
    
    * checks/files{,.desc}:
      + [RA] Remove the check for x11-common pre-depends before installing
        files in /usr/{include,lib}/X11.  Policy 3.8.3 removes this
        requirement.

diff --git a/checks/files b/checks/files
index 9a84327..22ea1b8 100644
--- a/checks/files
+++ b/checks/files
@@ -155,7 +155,6 @@ if (defined $info->field('section')) {
 my %script = map {$_ => 1} (sort keys %{$info->scripts});
 
 # We only want to warn about these once.
-my $warned_x11_predepends = 0;
 my $warned_debug_name = 0;
 
 my @devhelp;
@@ -349,19 +348,6 @@ foreach my $file (sort keys %{$info->index}) {
 	    tag "old-app-defaults-directory", "$file";
 	}
 
-	#----------------- /usr/{include,lib}/X11/
-	# Packages installing files here will need to pre-depend on x11-common
-	# so that the symlinks will be sorted out first on a sarge upgrade.
-	elsif ($file =~ m,^usr/(?:include|lib)/X11(/|\Z),
-	       && !$warned_x11_predepends && $pkg ne 'x11-common') {
-	    tag "file-in-usr-something-x11-without-pre-depends", "$file"
-		unless $info->relation('pre-depends')->implies('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, && $pkg ne 'x11-common') {
 	    tag "package-installs-file-to-usr-x11r6-bin", "$file";
diff --git a/checks/files.desc b/checks/files.desc
index 9b55796..3e63a99 100644
--- a/checks/files.desc
+++ b/checks/files.desc
@@ -55,21 +55,6 @@ Info: Debian has switched to the modular X tree which now uses the regular
  1:1.0.2-2) for the correct paths.
 Ref: policy 11.8.7
 
-Tag: file-in-usr-something-x11-without-pre-depends
-Severity: wishlist
-Certainty: certain
-Info: Packages that install files into /usr/include/X11 or /usr/lib/X11
- should pre-depend on at least x11-common (&gt;= 1:7.0.0).  These directories
- used to be symlinks and installing files in them while they are still
- symlinks will put files in the wrong locations and cause stranded files
- and other problems.  x11-common is responsible for converting the
- symlinks to regular directories.
- .
- A fresh etch (or later) install will not have problems even without this
- dependency, but this dependency is needed for upgrades from sarge and is
- therefore still useful for backports.
-Ref: policy 11.8.7
-
 Tag: package-installs-file-to-usr-x11r6
 Severity: important
 Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index ee5f4e1..af3416a 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ lintian (2.2.14) UNRELEASED; urgency=low
       - patch-system-but-no-source-readme
       - package-modifies-ld.so-search-path
       - possible-documentation-but-no-doc-base-registration
+    + Removed:
+      - file-in-usr-something-x11-without-pre-depends
 
   * checks/changelog-file.desc:
     + [RA] Document the "Old Changelog" way of marking historic changelog
@@ -29,12 +31,15 @@ lintian (2.2.14) UNRELEASED; urgency=low
     + [RA] Allow any package to be in section oldlibs without triggering
       warnings.  Thanks, Rene Engelhard.  (Closes: #537606)
     + [RA] Lower wrong-section-according-to-package-name to possible.
-  * checks/files:
+  * checks/files{,.desc}:
     + [CW] /var/lock and /var/run are not temporary filesystems in d-i, so
       don't emit errors about their use in udebs.
     + [RA] Warn about packages containing files in /etc/ld.so.conf.d that
       don't appear to be part of libc.  Policy 3.8.3 no longer permits
       modification of ld.so.conf.
+    + [RA] Remove the check for x11-common pre-depends before installing
+      files in /usr/{include,lib}/X11.  Policy 3.8.3 removes this
+      requirement.
   * checks/infofiles.desc:
     + [RA] Add missing leading * to example info directory entry.
   * checks/lintian.desc:

-- 
Debian package checker


Reply to: