Lintian update for lenny (through t-p-u)
Hi.
We noticed a yet unreported RC bug in the version of lintian in lenny
(it will fail on purge in most cases) and we would like to fix this
through t-p-u as we already have a new version in unstable.
I've included a second fix which removes a tag which annoyed many
people. This is not critical though and can be removed if you want.
Diff for the planned upload:
diff --git a/checks/copyright-file b/checks/copyright-file
index 3f87743..78849c7 100644
--- a/checks/copyright-file
+++ b/checks/copyright-file
@@ -149,17 +149,6 @@ local $/ = undef;
$_ = <IN>;
close(IN);
-# We have to decode into UTF-8 to get the right length for the length
-# check. For some reason, use open ':utf8' isn't sufficient. If the
-# file uses a non-UTF-8 encoding, this will mangle it, but it doesn't
-# matter for the length check.
-my @lines = split ("\n", decode ('utf-8', $_));
-for my $i (0 .. $#lines) {
- if (length ($lines[$i]) > 80) {
- tag "debian-copyright-line-too-long", "line " . ($i+1);
- }
-}
-
my $wrong_directory_detected = 0;
if (m,\<fill in (http/)?ftp site\>, or m/\<Must follow here\>/) {
diff --git a/checks/copyright-file.desc b/checks/copyright-file.desc
index 4481595..1977198 100644
--- a/checks/copyright-file.desc
+++ b/checks/copyright-file.desc
@@ -267,10 +267,3 @@ Info: This package appears to be covered by the GNU GPL but depends on
override for this tag. Lintian currently has no good way of
distinguishing between that case and problematic packages.
-Tag: debian-copyright-line-too-long
-Type: warning
-Info: One or more lines in the copyright file contain more than 80 characters.
- For the benefit of users of 80x25 terminals, it is recommended that the
- lines do not exceed 80 characters.
-Ref: policy 12.5
-
diff --git a/debian/changelog b/debian/changelog
index 9e06924..d83ed54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+lintian (1.24.2.1) unstable; urgency=low
+
+ The "for the sake of stable users" release.
+
+ * checks/copyright-file{,.desc}:
+ + [ADB] Drop the "copyright line too long" check. Most of the issues
+ it flags aren't easily fixable, particularly where the copyright file
+ is (semi)automatically generated. (Closes: #491302, #491365, #491685)
+
+ * debian/postrm:
+ + [FL] Do not try to remove /var/spool/lintian if it doesn't exist
+ (dpkg might already removed it at this point).
+
+ -- Frank Lichtenheld <djpig@debian.org> Sat, 09 Aug 2008 10:46:44 -0300
+
lintian (1.24.2) unstable; urgency=low
The "welcome Adam D. Barratt!" release.
diff --git a/debian/postrm b/debian/postrm
index 183c845..8bc9de5 100755
--- a/debian/postrm
+++ b/debian/postrm
@@ -11,7 +11,7 @@ if [ "$1" = "purge" ]; then
rm -rf /var/spool/lintian/udeb
rm -rf /var/spool/lintian/info
fi
- rmdir --ignore-fail-on-non-empty /var/spool/lintian
+ [ ! -d /var/spool/lintian ] || rmdir --ignore-fail-on-non-empty /var/spool/lintian
fi
#DEBHELPER#
diff --git a/testset/copyright/debian/copyright.misc-errors b/testset/copyright/debian/copyright.misc-errors
index 50c5213..c434ac0 100644
--- a/testset/copyright/debian/copyright.misc-errors
+++ b/testset/copyright/debian/copyright.misc-errors
@@ -16,9 +16,3 @@ This path /usr/share/doc/copyright is obsolete.
This copyright info was automatically extracted from the perl module.
It may not be accurate, so you better check the module sources
if you don't want to get into legal troubles.
-
-This line is overly long. It should be less than 80 characters so that it fits nicely in an 80x25 terminal.
-
-This line isn't too long, but ćōňţăĭņş a number of UTF-8 characters which
-could make it appear to be if improperly decoded.
-
diff --git a/testset/tags.copyright b/testset/tags.copyright
index 72005ab..c78fa16 100644
--- a/testset/tags.copyright
+++ b/testset/tags.copyright
@@ -17,6 +17,5 @@ W: copyright.iso-8859-1: debian-copyright-file-uses-obsolete-national-encoding a
W: copyright.misc-errors: copyright-contains-dh-make-perl-boilerplate
W: copyright.misc-errors: copyright-has-url-from-dh_make-boilerplate
W: copyright.misc-errors: copyright-lists-upstream-authors-with-dh_make-boilerplate
-W: copyright.misc-errors: debian-copyright-line-too-long line 20
W: copyright.old-style: copyright-without-copyright-notice
W: copyright.symlink: copyright-without-copyright-notice
Gruesse,
--
Frank Lichtenheld <djpig@debian.org>
www: http://www.djpig.de/
Reply to: