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

lintian: r30 - in trunk: checks debian



Author: jeroen
Date: 2004-02-12 16:09:40 +0100 (Thu, 12 Feb 2004)
New Revision: 30

Modified:
   trunk/checks/changelog-file
   trunk/checks/changelog-file.desc
   trunk/debian/changelog
Log:
Back out Colin's UTF-8 patch (r3), because:
- Cruft output when test fails
- Dependencies not strict enough, don't know yet how to solve
- Missing testcases

Reopens: #175318


Modified: trunk/checks/changelog-file
===================================================================
--- trunk/checks/changelog-file	2004-02-12 02:04:52 UTC (rev 29)
+++ trunk/checks/changelog-file	2004-02-12 15:09:40 UTC (rev 30)
@@ -20,7 +20,6 @@
 # MA 02111-1307, USA.
 
 use strict;
-use utf8;
 
 ($#ARGV == 1) or fail("syntax: changelog-file <pkg> <type>");
 my $pkg = shift;
@@ -189,15 +188,6 @@
     }
 }
 
-open (IN, "<:utf8", "changelog") or fail("cannot find changelog for $type package $pkg");
-while (<IN>) {
-  unless (utf8::valid($_)) {
-    print "E: $pkg $type: debian-changelog-file-uses-obsolete-national-charset\n";
-    last;
-  }
-}
-close IN;
-
 # read the changelog itself
 #
 # emacs only looks at the last "local variables:" in a file, and only at

Modified: trunk/checks/changelog-file.desc
===================================================================
--- trunk/checks/changelog-file.desc	2004-02-12 02:04:52 UTC (rev 29)
+++ trunk/checks/changelog-file.desc	2004-02-12 15:09:40 UTC (rev 30)
@@ -89,16 +89,3 @@
  files.  Instead, put something like this in your ~/.emacs:
  .
  (setq debian-changelog-mailing-address "userid@debian.org")
-
-Tag: debian-changelog-file-uses-obsolete-national-charset
-Type: error
-Info: The Debian changelog file must be valid UTF-8, an encoding of
- the Unicode character set. 
- .
- There are many ways to convert a changelog from an obsoleted charset
- like ISO-8859-1; you may for example use "iconv" like:
- .
- $ iconv --from-code=ISO-8859-1 --to-code=UTF-8 changelog > changelog.new
- .
- $ mv changelog.new changelog
-Ref: policy 5.3

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-02-12 02:04:52 UTC (rev 29)
+++ trunk/debian/changelog	2004-02-12 15:09:40 UTC (rev 30)
@@ -5,8 +5,6 @@
   Jeroen van Wolffelaar <jeroen@wolffelaar.nl>
    * Upgrade lintian itself to policy 3.6.1
      + Drop question about removing lab on purge, just do it.
-   * Check whether changelog is valid UTF-8 (Closes: #175318)
-     (Patch by: Colin Walters <walters@debian.org>)
    * Update to Debian Policy 3.6.1, all references broken by
      section-reorganization are updated (Closes: #194257, #208945, #214949,
      also closes: #217384, #231884)



Reply to: