Author: rra
Date: 2007-04-28 07:29:57 +0200 (Sat, 28 Apr 2007)
New Revision: 871
Modified:
trunk/checks/files
trunk/checks/files.desc
trunk/debian/changelog
trunk/testset/tags.filenames
Log:
+ [RA] Downgrade the pre-depends on x11-common requirement for
packages installing into /usr/include/X11 or /usr/lib/X11 to info
since it's only needed for upgrades from sarge or early etch.
Modified: trunk/checks/files
===================================================================
--- trunk/checks/files 2007-04-28 05:05:05 UTC (rev 870)
+++ trunk/checks/files 2007-04-28 05:29:57 UTC (rev 871)
@@ -238,8 +238,8 @@
}
#----------------- /usr/{include,lib}/X11/
- # Packages installing files here must pre-depend on x11-common
- # so that the symlinks will be sorted out first.
+ # 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/,
&& !$warned_x11_predepends && $pkg ne 'x11-common') {
my $pre_depends = '';
Modified: trunk/checks/files.desc
===================================================================
--- trunk/checks/files.desc 2007-04-28 05:05:05 UTC (rev 870)
+++ trunk/checks/files.desc 2007-04-28 05:29:57 UTC (rev 871)
@@ -53,13 +53,17 @@
Ref: policy 11.8.7
Tag: file-in-usr-something-x11-without-pre-depends
-Type: error
+Type: info
Info: Packages that install files into /usr/include/X11 or /usr/lib/X11
- must pre-depend on at least x11-common (>= 1:7.0.0). These directories
+ should pre-depend on at least x11-common (>= 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
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-04-28 05:05:05 UTC (rev 870)
+++ trunk/debian/changelog 2007-04-28 05:29:57 UTC (rev 871)
@@ -44,6 +44,9 @@
+ [RA] Use $pkg rather than reading fields/package for the x11-common
pre-depend check.
+ [RA] Allow x11-common to install /usr/X11R6/bin.
+ + [RA] Downgrade the pre-depends on x11-common requirement for
+ packages installing into /usr/include/X11 or /usr/lib/X11 to info
+ since it's only needed for upgrades from sarge or early etch.
* 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,
@@ -83,7 +86,7 @@
file that cannot be satisfied by that package (including via
Provides). (Closes: #56440)
- -- Russ Allbery <[EMAIL PROTECTED]> Fri, 27 Apr 2007 22:04:52 -0700
+ -- Russ Allbery <[EMAIL PROTECTED]> Fri, 27 Apr 2007 22:23:22 -0700
lintian (1.23.29) unstable; urgency=low
Modified: trunk/testset/tags.filenames
===================================================================
--- trunk/testset/tags.filenames 2007-04-28 05:05:05 UTC (rev 870)
+++ trunk/testset/tags.filenames 2007-04-28 05:29:57 UTC (rev 871)
@@ -3,7 +3,6 @@
E: filenames: dir-or-file-in-srv srv/foo/
E: filenames: dir-or-file-in-srv srv/foo/bar
E: filenames: file-in-etc-not-marked-as-conffile /etc/gconf/schemas/test.schema
-E: filenames: file-in-usr-something-x11-without-pre-depends usr/include/X11/
E: filenames: lengthy-symlink usr/lib/filenames/symlink4wrong
../filenames/symlink2
E: filenames: lengthy-symlink usr/share/doc/filenames/version.txt.gz
../filenames/doc/version6.txt.gz
E: filenames: no-copyright-file
@@ -28,6 +27,7 @@
E: filenames: use-of-compat-symlink usr/bin/X11/
E: filenames: use-of-compat-symlink usr/bin/X11/testxbin
I: filenames source: arch-inventory-file-in-source files/.arch-inventory
+I: filenames: file-in-usr-something-x11-without-pre-depends usr/include/X11/
I: filenames: no-md5sums-control-file
W: filenames source: ancient-standards-version 3.1.1 (current is 3.7.2)
W: filenames source: source-contains-CVS-dir CVS
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
