[SCM] Debian package checker branch, master, updated. 2.5.3-54-g917706b

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit 917706b6ce9db6ba1349bd7e3ff625a7be938f73
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Oct 9 15:13:48 2011 +0200

    reporting: Do not accept LINTIAN_UNPACK_LEVEL nor LINTIAN_SECTION
    
    The lintian frontend lost support for these in 2.5.0~rc3.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 03279cb..83d4fd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -100,6 +100,10 @@ lintian (2.5.4) UNRELEASED; urgency=low
   * reporting/*:
     + [NT] Recognise and display pedantic tags.
     + [JW] Only emit "plus X overrides" if there any overrides.
+  * reporting/{harness,html_reports}:
+    + [NT] Do not accept LINTIAN_UNPACK_LEVEL nor LINTIAN_SECTION
+      anymore.  The lintian frontend lost support for these in
+      2.5.0~rc3.
 
  -- Niels Thykier <niels@thykier.net>  Sat, 10 Sep 2011 13:44:01 +0200
 
diff --git a/reporting/config b/reporting/config
index f2246ff..0250309 100644
--- a/reporting/config
+++ b/reporting/config
@@ -13,7 +13,6 @@ $LOG_DIR = "$HOME/logs";
 $HTML_DIR = "$HOME/www";
 $HTML_TMP_DIR = "$HTML_DIR.new";
 $LINTIAN_CFG = "$LINTIAN_ROOT/reporting/lintian-dummy.cfg";  # this config file has to be empty!
-$LINTIAN_UNPACK_LEVEL = "";
 $LINTIAN_BIN_DIR = "$HOME/bin";
 $LINTIAN_GPG_CHECK = 0;
 
diff --git a/reporting/harness b/reporting/harness
index 3a42f75..064871f 100755
--- a/reporting/harness
+++ b/reporting/harness
@@ -53,7 +53,7 @@ die 'Cannot use other modes with reports only.' if ($opt_r && ($opt_i || $opt_f
 # read configuration
 require './config';
 use vars qw($LINTIAN_ROOT $LINTIAN_LAB $LINTIAN_ARCHIVEDIR $LINTIAN_DIST
-            $LINTIAN_SECTION $LINTIAN_ARCH $LINTIAN_UNPACK_LEVEL $LINTIAN_CFG
+            $LINTIAN_ARCH $LINTIAN_CFG
             $lintian_cmd $html_reports_cmd
             $log_file $lintian_log $old_lintian_log
             $changes_file $list_file $html_reports_log
@@ -86,18 +86,6 @@ $ENV{'LINTIAN_CFG'} = $LINTIAN_CFG;
 $ENV{'LINTIAN_LAB'} = $LINTIAN_LAB;
 $ENV{'LINTIAN_ARCHIVEDIR'} = $LINTIAN_ARCHIVEDIR;
 $ENV{'LINTIAN_DIST'} = $LINTIAN_DIST;
-$ENV{'LINTIAN_UNPACK_LEVEL'} = $LINTIAN_UNPACK_LEVEL;
-# LINTIAN_SECTION is deprecated in favour of LINTIAN_AREA
-if (defined $LINTIAN_SECTION) {
-    print STDERR 'warning: LINTIAN_SECTION has been deprecated in favour of LINTIAN_AREA.\n';
-    if (defined $LINTIAN_AREA) {
-        print STDERR 'Using LINTIAN_AREA as both were defined.\n';
-    } else {
-        print STDERR 'Both are currently accepted, but LINTIAN_SECTION may be removed\n';
-        print STDERR 'in a future Lintian release.\n';
-        $LINTIAN_AREA = $LINTIAN_SECTION;
-    }
-}
 $ENV{'LINTIAN_AREA'} = $LINTIAN_AREA;
 $ENV{'LINTIAN_ARCH'} = $LINTIAN_ARCH;
 $ENV{'PATH'} = $LINTIAN_BIN_DIR . ':' . $ENV{'PATH'};
diff --git a/reporting/html_reports b/reporting/html_reports
index 2e4590b..438d09a 100755
--- a/reporting/html_reports
+++ b/reporting/html_reports
@@ -33,16 +33,12 @@ use Text::Template ();
 # These have no default and must be set in the configuration file.
 # FIXME: $statistics_file should be in all caps as well.
 our ($LINTIAN_ROOT, $LINTIAN_LAB, $LINTIAN_ARCHIVEDIR, $LINTIAN_DIST,
-     $LINTIAN_SECTION, $LINTIAN_ARCH, $HTML_TMP_DIR, $statistics_file,
+     $LINTIAN_ARCH, $HTML_TMP_DIR, $statistics_file,
      $LINTIAN_AREA, $HISTORY, $HISTORY_DIR, $LINTIAN_SOURCE);
 
 # Read the configuration.
 require './config';
 
-if (defined $LINTIAN_SECTION and not defined $LINTIAN_AREA) {
-    $LINTIAN_AREA = $LINTIAN_SECTION;
-}
-
 # The path to the mirror timestamp.
 our $LINTIAN_TIMESTAMP
     = "$LINTIAN_ARCHIVEDIR/project/trace/ftp-master.debian.org";

-- 
Debian package checker