[lintian] 01/03: Revert "Add a global exception list"

[Niels Thykier <nthykier@moszumanska.debian.org>]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository lintian.

commit e139939f236e7c753a7a6fc33a5283edecc50694
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Dec 14 09:55:39 2013 +0100

    Revert "Add a global exception list"
    
    Reverting this commit as it is about to become redundant, when
    35aa013d0bf512e89fa9fb6488966d36b0b474c5 is also reverted.
    
    This reverts commit 745fb495d66d936615c4d39363c41fbbcda63952.
    
    Conflicts:
    	debian/changelog
---
 data/spelling/exceptions | 17 -----------------
 debian/changelog         |  2 --
 lib/Lintian/Check.pm     |  3 ---
 3 files changed, 22 deletions(-)

diff --git a/data/spelling/exceptions b/data/spelling/exceptions
deleted file mode 100644
index 6b8c216..0000000
--- a/data/spelling/exceptions
+++ /dev/null
@@ -1,17 +0,0 @@
-# All spelling false-positive that have been observed "in the wild" in package
-# descriptions are added here, on the grounds that if they occurred once they
-# are more likely to occur again.
-#
-# Be careful with corrections that involve punctuation, since the check is a
-# bit rough with punctuation.  For example, I had to delete the correction of
-# "builtin" to "built-in".
-#
-# The format of each line is:
-# exception
-#
-# Note that corrections involving multiple word mistakes or case errors
-# should be included in the appropriate data file, rather than here.
-#
-# Please use alpha sort
-process
-programming
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 008758d..b6e4bb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -68,8 +68,6 @@ lintian (2.5.20) UNRELEASED; urgency=low
   * lib/Lintian/Check.pm:
     + [RG] Detect a few more spelling mistakes by removing some
       suffixes before looking them up in the list of spelling mistakes.
-    + [BR] Add a list of global exception for spelling mistakes.
-      (Closes: #730715)
   * lib/Lintian/Collect/Binary.pm:
     + [GN] Add support for multi-component RPATHs.  (Closes: #727683)
   * lib/Lintian/Collect/Package.pm:
diff --git a/lib/Lintian/Check.pm b/lib/Lintian/Check.pm
index eb4df6d..6cf9153 100644
--- a/lib/Lintian/Check.pm
+++ b/lib/Lintian/Check.pm
@@ -244,7 +244,6 @@ sub check_spelling {
     my $corrections = Lintian::Data->new('spelling/corrections', '\|\|');
     my $corrections_multiword
       = Lintian::Data->new('spelling/corrections-multiword', '\|\|');
-    my $global_exceptions = Lintian::Data->new('spelling/exceptions');
 
     $text =~ s/[()\[\]]//g;
     $text =~ s/(\w-)\s*\n\s*/$1/;
@@ -258,8 +257,6 @@ sub check_spelling {
         # Some exceptions are based on case (e.g. "teH").
         next if exists($exceptions->{$word});
         my $lcword = lc $word;
-        # global exception are case insentive
-        next if $global_exceptions->known($lcword);
         if ($corrections->known($lcword)
             &&!exists($exceptions->{$lcword})) {
             $correction = $corrections->value($lcword);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git