[SCM] Debian package checker branch, infra-513663, updated. 2.4.3-177-g13d94df
The following commit has been merged in the infra-513663 branch:
commit cb4239e67fd79ced5635db848a6c99e433680c0f
Author: Niels Thykier <niels@thykier.net>
Date: Sun Jan 16 18:08:35 2011 +0100
Removed support for LINTIAN_SECTION (deprecated since 2009)
Note that the --section switch still works. First of all it did
not trigger a deprecation warning and secondly it was documented
as an alias of --area (unlike LINTIAN_SECTION).
diff --git a/frontend/lintian b/frontend/lintian
index 900db4d..a0f7637 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -65,7 +65,6 @@ our $OPT_LINTIAN_AREA = ""; #string for the --area option
# These options can also be used via default or environment variables
our $LINTIAN_CFG = ""; #config file to use
our $LINTIAN_ROOT; #location of the lintian modules
-our $OPT_LINTIAN_SECTION = ""; #old name for OPT_LINTIAN_ARCH
my $experimental_output_opts = undef;
@@ -482,7 +481,7 @@ if ($LINTIAN_CFG) {
undef $LINTIAN_CFG;
}
-use constant VARS => qw(LAB ARCHIVEDIR DIST SECTION AREA ARCH);
+use constant VARS => qw(LAB ARCHIVEDIR DIST AREA ARCH);
# read configuration file
if ($LINTIAN_CFG) {
open(CFG, '<', $LINTIAN_CFG)
@@ -532,18 +531,6 @@ unless (defined $LINTIAN_ARCH) {
}
}
-# 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;
- }
-}
-
# export current settings for our helper scripts
foreach (('ROOT', 'CFG', VARS)) {
no strict 'refs';
diff --git a/man/lintian.pod.in b/man/lintian.pod.in
index 7a5d7c9..c747ab5 100644
--- a/man/lintian.pod.in
+++ b/man/lintian.pod.in
@@ -469,7 +469,7 @@ Search for package foo in the Debian archive and check it. (Depending
on what is found, this command will check either the source or binary
package foo, or both.)
-=item B<$ lintian --archivedir /var/packages --dist custom --section main>
+=item B<$ lintian --archivedir /var/packages --dist custom --area main>
Check all packages found in the Debian archive at
I</var/packages/dists/custom/main>.
--
Debian package checker
Reply to: