Bug#406349: lintian: Some tests contain 'usr-doc' which should be 'usr-share-doc'
Package: lintian
Version: 1.23.27
Severity: minor
Tags: patch
Hi,
The following tests:
usr-doc-symlink-points-outside-of-usr-doc
usr-doc-symlink-without-dependency
usr-doc-symlink-to-foreign-package
cannot-check-whether-usr-doc-symlink-points-to-foreign-package
still have names with 'usr-doc', while they actually do not test for
stuff under /usr/doc but /usr/share/doc. This is of course fine other
than that the tag names should be updated. Attached is a patch to do
that.
I've left the following two tests, which actually *do* relate to
/usr/doc:
postinst-should-not-set-usr-doc-link
doc-base-file-references-usr-doc
thanks,
Thijs
-- System Information:
Debian Release: 4.0
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.11-1-k7
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Versions of packages lintian depends on:
ii binutils 2.17-3 The GNU assembler, linker and bina
ii diffstat 1.43-2 produces graph of changes introduc
ii dpkg-dev 1.13.25 package building tools for Debian
ii file 4.17-5 Determines file type using "magic"
ii gettext 0.16.1-1 GNU Internationalization utilities
ii intltool-debian 0.35.0+20060710.1 Help i18n of RFC822 compliant conf
ii libparse-debianchangel 1.0-1 parse Debian changelogs and output
ii man-db 2.4.3-5 The on-line manual pager
ii perl [libdigest-md5-pe 5.8.8-7 Larry Wall's Practical Extraction
lintian recommends no packages.
-- no debconf information
diff -Nru /tmp/Ty38Mr2fv0/lintian-1.23.27/checks/copyright-file /tmp/IFe0sL7AhL/lintian-1.23.28/checks/copyright-file
--- /tmp/Ty38Mr2fv0/lintian-1.23.27/checks/copyright-file 2006-08-19 01:12:38.000000000 +0200
+++ /tmp/IFe0sL7AhL/lintian-1.23.28/checks/copyright-file 2007-01-10 15:56:46.000000000 +0100
@@ -73,7 +73,7 @@
# check if this symlink references a directory elsewhere
if ($link =~ m,^(\.\.)?/,) {
- tag "usr-doc-symlink-points-outside-of-usr-doc", "$link";
+ tag "usr-share-doc-symlink-points-outside-of-usr-share-doc", "$link";
last;
}
@@ -96,7 +96,7 @@
defined($known_essential{$link}))) {
# no, it does not.
- tag "usr-doc-symlink-without-dependency", "$link";
+ tag "usr-share-doc-symlink-without-dependency", "$link";
last;
}
}
@@ -110,10 +110,10 @@
# yes, everything is ok.
} else {
# no, it is not.
- tag "usr-doc-symlink-to-foreign-package", "$link";
+ tag "usr-share-doc-symlink-to-foreign-package", "$link";
}
} else { # no, source is not available
- tag "cannot-check-whether-usr-doc-symlink-points-to-foreign-package", "";
+ tag "cannot-check-whether-usr-share-doc-symlink-points-to-foreign-package", "";
}
# everything is ok.
diff -Nru /tmp/Ty38Mr2fv0/lintian-1.23.27/checks/copyright-file.desc /tmp/IFe0sL7AhL/lintian-1.23.28/checks/copyright-file.desc
--- /tmp/Ty38Mr2fv0/lintian-1.23.27/checks/copyright-file.desc 2006-04-13 07:15:53.000000000 +0200
+++ /tmp/IFe0sL7AhL/lintian-1.23.28/checks/copyright-file.desc 2007-01-10 15:57:23.000000000 +0100
@@ -46,7 +46,7 @@
<tt>/usr/share/common-licenses/GPL</tt> instead.
Ref: policy 12.5
-Tag: usr-doc-symlink-without-dependency
+Tag: usr-share-doc-symlink-without-dependency
Type: error
Info: If the package installs a symbolic link /usr/share/doc/<i>pkg1</i> ->
<i>pkg2</i>, then <i>pkg1</i> has to depend on <i>pkg2</i> with the same
@@ -57,7 +57,7 @@
directory within <i>pkg1</i> and copy the copyright file into that directory.
Ref: policy 12.5
-Tag: usr-doc-symlink-to-foreign-package
+Tag: usr-share-doc-symlink-to-foreign-package
Type: error
Info: If the package installs a symbolic link /usr/share/doc/<i>pkg1</i> ->
<i>pkg2</i>, then <i>pkg1</i> and <i>pkg2</i> must both come from the same
@@ -67,7 +67,7 @@
within <i>pkg1</i> and copy the copyright file to that directory.
Ref: policy 12.5
-Tag: cannot-check-whether-usr-doc-symlink-points-to-foreign-package
+Tag: cannot-check-whether-usr-share-doc-symlink-points-to-foreign-package
Type: info
Info: There is a symlink /usr/share/doc/<i>pkg1</i> -> <i>pkg2</i>
in your package. This means that <i>pkg1</i> and <i>pkg2</i> must
@@ -103,7 +103,7 @@
file. Please update the reference (the licenses are installed
uncompressed).
-Tag: usr-doc-symlink-points-outside-of-usr-doc
+Tag: usr-share-doc-symlink-points-outside-of-usr-share-doc
Type: error
Info: The /usr/share/doc/<i>pkg</i> symbolic link is pointing to a directory
outside of <tt>/usr/share/doc</tt>.
diff -Nru /tmp/Ty38Mr2fv0/lintian-1.23.27/testset/tags.relations /tmp/IFe0sL7AhL/lintian-1.23.28/testset/tags.relations
--- /tmp/Ty38Mr2fv0/lintian-1.23.27/testset/tags.relations 2006-11-11 07:03:19.000000000 +0100
+++ /tmp/IFe0sL7AhL/lintian-1.23.28/testset/tags.relations 2007-01-10 15:57:39.000000000 +0100
@@ -15,7 +15,7 @@
E: relations-multiple-libs: package-depends-on-multiple-tcl-versions tcl8.0 tcl8.2
E: relations-multiple-libs: package-depends-on-multiple-tk-versions tk8.2 tk8.3
E: relations-multiple-libs: package-depends-on-multiple-tkx-versions tkx8.2 tkx8.3
-E: relations-multiple-libs: usr-doc-symlink-without-dependency relations
+E: relations-multiple-libs: usr-share-doc-symlink-without-dependency relations
E: relations: bad-version-in-relation conflicts: foobar (<< 5&5)
E: relations: conflicts-with-dependency foo
E: relations: conflicts-with-dependency relations
Reply to: