[SCM] Debian package checker branch, master, updated. 2.5.2-3-gb6736e0
The following commit has been merged in the master branch:
commit b6736e0f9d545cb186cca34e8bba1ccad62fdf1e
Author: Niels Thykier <niels@thykier.net>
Date: Sat Aug 13 15:10:49 2011 +0200
Removed collection/fields and (hopefully) all uses of it
The collection was replaced in 2.5.2 by a smarter Lintian::Collect
API.
diff --git a/checks/binaries.desc b/checks/binaries.desc
index ff1652a..41f865e 100644
--- a/checks/binaries.desc
+++ b/checks/binaries.desc
@@ -2,7 +2,7 @@ Check-Script: binaries
Author: Christian Schwarz <schwarz@debian.org>
Abbrev: bin
Type: binary, udeb
-Needs-Info: objdump-info, file-info, strings, fields, index
+Needs-Info: objdump-info, file-info, strings, index
Info: This script checks binaries and object files for bugs.
Tag: arch-independent-package-contains-binary-or-object
diff --git a/checks/changelog-file.desc b/checks/changelog-file.desc
index e0451fa..3507629 100644
--- a/checks/changelog-file.desc
+++ b/checks/changelog-file.desc
@@ -2,7 +2,7 @@ Check-Script: changelog-file
Author: Christian Schwarz <schwarz@debian.org>
Abbrev: chg
Type: binary
-Needs-Info: file-info, changelog-file, fields, index
+Needs-Info: file-info, changelog-file, index
Info: This script checks if a binary package conforms to policy
with regards to changelog files.
.
diff --git a/checks/changes-file.desc b/checks/changes-file.desc
index 4f03216..dda3f32 100644
--- a/checks/changes-file.desc
+++ b/checks/changes-file.desc
@@ -1,7 +1,6 @@
Check-Script: changes-file
Abbrev: chng
Type: changes
-Needs-info: fields
Info: This script checks for various problems with .changes files
Tag: malformed-changes-file
diff --git a/checks/circular-deps.desc b/checks/circular-deps.desc
index a652ced..349e406 100644
--- a/checks/circular-deps.desc
+++ b/checks/circular-deps.desc
@@ -4,7 +4,6 @@ Abbrev: cdeps
# This is a source check, so we only calculate the dependency
# graphs once.
Type: source
-Needs-info: fields
Info: This script checks for circular dependencies between packages
built from the same source.
diff --git a/checks/copyright-file.desc b/checks/copyright-file.desc
index 561f6ce..64f774f 100644
--- a/checks/copyright-file.desc
+++ b/checks/copyright-file.desc
@@ -2,7 +2,7 @@ Check-Script: copyright-file
Author: Christian Schwarz <schwarz@debian.org>
Abbrev: cpy
Type: binary
-Needs-Info: copyright-file, fields, index
+Needs-Info: copyright-file, index
Info: This script checks if a binary package conforms to policy
with regard to copyright files.
.
diff --git a/checks/cruft.desc b/checks/cruft.desc
index a8b001f..c09b276 100644
--- a/checks/cruft.desc
+++ b/checks/cruft.desc
@@ -3,7 +3,7 @@ Author: Sean 'Shaleh' Perry <shaleh@debian.org>
Abbrev: deb
Type: source
Info: This looks for cruft in Debian packaging or upstream source
-Needs-Info: unpacked, debfiles, diffstat, file-info, fields, index
+Needs-Info: unpacked, debfiles, diffstat, file-info, index
Tag: native-package-with-dash-version
Severity: normal
diff --git a/checks/debconf.desc b/checks/debconf.desc
index 9eda42e..b3177ef 100644
--- a/checks/debconf.desc
+++ b/checks/debconf.desc
@@ -3,7 +3,7 @@ Author: Colin Watson <cjwatson@debian.org>
Abbrev: dc
Type: binary, udeb, source
Info: This looks for common mistakes in packages using debconf.
-Needs-Info: bin-pkg-control, debfiles, unpacked, scripts, fields
+Needs-Info: bin-pkg-control, debfiles, unpacked, scripts
Tag: missing-debconf-dependency
Severity: normal
diff --git a/checks/debhelper.desc b/checks/debhelper.desc
index 09a457e..0176837 100644
--- a/checks/debhelper.desc
+++ b/checks/debhelper.desc
@@ -3,7 +3,7 @@ Author: Joey Hess <joeyh@debian.org>
Abbrev: dh
Type: source
Info: This looks for common mistakes in debhelper source packages.
-Needs-Info: debfiles, source-control-file, fields
+Needs-Info: debfiles, source-control-file
Tag: maintainer-script-lacks-debhelper-token
Severity: normal
diff --git a/checks/description.desc b/checks/description.desc
index e8391d8..7cde14a 100644
--- a/checks/description.desc
+++ b/checks/description.desc
@@ -2,7 +2,6 @@ Check-Script: description
Author: Christian Schwarz <schwarz@debian.org>
Abbrev: des
Type: binary, udeb
-Needs-info: fields
Info: Check if the Description control field of a binary package conforms
to the rules in the Policy Manual (section 3.4).
diff --git a/checks/fields.desc b/checks/fields.desc
index 95861f9..425b2d9 100644
--- a/checks/fields.desc
+++ b/checks/fields.desc
@@ -2,7 +2,7 @@ Check-Script: fields
Author: Marc 'HE' Brockschmidt <marc@marcbrockschmidt.de>
Abbrev: fld
Type: binary, udeb, source
-Needs-Info: debfiles, source-control-file, fields, index
+Needs-Info: debfiles, source-control-file, index
Info: This script checks the syntax of the fields in package control files,
as described in the Policy Manual.
diff --git a/checks/filename-length.desc b/checks/filename-length.desc
index 97686d6..eefec1b 100644
--- a/checks/filename-length.desc
+++ b/checks/filename-length.desc
@@ -2,7 +2,6 @@ Check-Script: filename-length
Author: Niels Thykier <niels@thykier.net>
Abbrev: flen
Type: source, binary, udeb
-Needs-info: fields
Info: This script checks for long package file names
Tag: package-has-long-file-name
diff --git a/checks/files.desc b/checks/files.desc
index b05015e..c3ccec6 100644
--- a/checks/files.desc
+++ b/checks/files.desc
@@ -2,7 +2,7 @@ Check-Script: files
Author: Christian Schwarz <schwarz@debian.org>
Abbrev: fil
Type: binary, udeb
-Needs-Info: unpacked, objdump-info, scripts, file-info, fields, index
+Needs-Info: unpacked, objdump-info, scripts, file-info, index
Info: This script checks if a binary package conforms to policy
WRT to files and directories.
diff --git a/checks/huge-usr-share.desc b/checks/huge-usr-share.desc
index d4d7f24..a5cabf8 100644
--- a/checks/huge-usr-share.desc
+++ b/checks/huge-usr-share.desc
@@ -2,7 +2,7 @@ Check-Script: huge-usr-share
Author: Jeroen van Wolffelaar <jeroen@wolffelaar.nl>
Abbrev: hus
Type: binary
-Needs-info: fields, index
+Needs-info: index
Info: This script checks whether an architecture-dependent package has
large amounts of data in /usr/share.
diff --git a/checks/manpages.desc b/checks/manpages.desc
index e9106c3..50fce12 100644
--- a/checks/manpages.desc
+++ b/checks/manpages.desc
@@ -2,7 +2,7 @@ Check-Script: manpages
Author: Christian Schwarz <schwarz@debian.org>
Abbrev: man
Type: binary
-Needs-Info: unpacked, file-info, index, fields
+Needs-Info: unpacked, file-info, index
Info: This script checks if a binary package conforms to manual page policy.
Tag: bad-link-to-undocumented-manpage
diff --git a/checks/nmu.desc b/checks/nmu.desc
index 1d8d02a..2ea03bb 100644
--- a/checks/nmu.desc
+++ b/checks/nmu.desc
@@ -2,7 +2,7 @@ Check-Script: nmu
Author: Jeroen van Wolffelaar <jeroen@wolffelaar.nl>
Abbrev: nmu
Type: source
-Needs-Info: debfiles, fields
+Needs-Info: debfiles
Info: This script checks if a source package is consistent about its NMU-ness.
Tag: orphaned-package-should-not-have-uploaders
diff --git a/checks/patch-systems.desc b/checks/patch-systems.desc
index b709e15..63a3162 100644
--- a/checks/patch-systems.desc
+++ b/checks/patch-systems.desc
@@ -3,7 +3,7 @@ Author: Marc Brockschmidt <he@debian.org>
Abbrev: pat
Type: source
Info: This script checks for various possible problems when using patch systems
-Needs-Info: debfiles, diffstat, fields
+Needs-Info: debfiles, diffstat
Tag: dpatch-build-dep-but-no-patch-list
Severity: normal
diff --git a/checks/rules.desc b/checks/rules.desc
index afc6b81..19e3529 100644
--- a/checks/rules.desc
+++ b/checks/rules.desc
@@ -1,7 +1,7 @@
Check-Script: rules
Author: Russ Allbery <rra@debian.org>
Type: source
-Needs-Info: debfiles, source-control-file, fields
+Needs-Info: debfiles, source-control-file
Info: Check targets and actions in debian/rules.
Abbrev: rul
diff --git a/checks/scripts.desc b/checks/scripts.desc
index 240868c..efca4af 100644
--- a/checks/scripts.desc
+++ b/checks/scripts.desc
@@ -3,7 +3,7 @@ Author: Richard Braakman <dark@xs4all.nl>
Abbrev: scr
Type: binary
Info: This script checks the #! lines of scripts in a package.
-Needs-Info: unpacked, file-info, scripts, bin-pkg-control, fields, index
+Needs-Info: unpacked, file-info, scripts, bin-pkg-control, index
Tag: script-without-interpreter
Severity: important
diff --git a/checks/shared-libs.desc b/checks/shared-libs.desc
index 49ccbab..ee53b54 100644
--- a/checks/shared-libs.desc
+++ b/checks/shared-libs.desc
@@ -2,7 +2,7 @@ Check-Script: shared-libs
Author: Christian Schwarz <schwarz@debian.org>
Abbrev: shl
Type: binary, udeb
-Needs-Info: unpacked, file-info, objdump-info, bin-pkg-control, fields, index
+Needs-Info: unpacked, file-info, objdump-info, bin-pkg-control, index
Info: This script checks if a binary package conforms to shared library policy.
Tag: shlib-with-executable-bit
diff --git a/checks/standards-version.desc b/checks/standards-version.desc
index 7640f43..1c9beed 100644
--- a/checks/standards-version.desc
+++ b/checks/standards-version.desc
@@ -4,7 +4,7 @@ Abbrev: std
Type: source
Info: This script checks if a source package contains a valid
Standards-Version field.
-Needs-Info: debfiles, source-control-file, fields
+Needs-Info: debfiles, source-control-file
Tag: no-standards-version-field
Severity: important
diff --git a/checks/symlinks.desc b/checks/symlinks.desc
index 43aa0fd..a88795e 100644
--- a/checks/symlinks.desc
+++ b/checks/symlinks.desc
@@ -2,7 +2,7 @@ Check-Script: symlinks
Author: Niels Thykier <niels@thykier.net>
Abbrev: sym
Type: binary, udeb
-Needs-Info: fields, index
+Needs-Info: index
Info: This script checks for broken symlinks.
Tag: package-contains-broken-symlink
diff --git a/checks/version-substvars.desc b/checks/version-substvars.desc
index 82ef3f3..8d5fa5e 100644
--- a/checks/version-substvars.desc
+++ b/checks/version-substvars.desc
@@ -2,7 +2,7 @@ Check-Script: version-substvars
Author: Adeodato Simó <dato@net.com.org.es>
Abbrev: v-s
Type: source
-Needs-Info: debfiles, source-control-file, fields
+Needs-Info: debfiles, source-control-file
Info: This script checks for correct use of the various
<tt>*Version</tt> substvars, e.g. deprecated substvars,
or usage that can cause un-binNMUability
diff --git a/checks/watch-file.desc b/checks/watch-file.desc
index 3993320..f35ce8c 100644
--- a/checks/watch-file.desc
+++ b/checks/watch-file.desc
@@ -2,7 +2,7 @@ Check-Script: watch-file
Author: Patrick Schoenfeld <schoenfeld@in-medisa-res.com>
Abbrev: watch
Type: source
-Needs-Info: debfiles, fields
+Needs-Info: debfiles
Info: Check debian/watch files in source packages.
Tag: debian-watch-file-is-missing
diff --git a/collection/fields b/collection/fields
deleted file mode 100755
index f8daaf7..0000000
--- a/collection/fields
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/perl -w
-# fields -- lintian collector script
-
-# DEPRECATED - Lintian::Collect pulls the fields directly from the
-# from the relevant places and caches them.
-
-# Copyright (C) 1998 Christian Schwarz
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, you can find it on the World Wide
-# Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-
-use strict;
-use warnings;
-
-if (-d 'fields'){
- system('rm', '-rf', 'fields') == 0
- or die 'Could not remove old fields directory';
-}
-
-exit 0;
-
diff --git a/collection/fields.desc b/collection/fields.desc
deleted file mode 100644
index 601b61e..0000000
--- a/collection/fields.desc
+++ /dev/null
@@ -1,6 +0,0 @@
-Collector-Script: fields
-Info: This script extracts the contents of the control file into
- fields/<tt>field</tt>.
-Type: binary, udeb, source, changes
-Version: 1
-Auto-Remove: yes
diff --git a/debian/changelog b/debian/changelog
index 0c9d444..d7bbc9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
lintian (2.5.3) UNRELEASED; urgency=low
+ * checks/*.desc:
+ + [NT] Dropped fields from Needs-Info, it is no longer needed.
+
+ * collection/fields{,.desc}:
+ + [NT] Removed, no longer used.
+
* data/spelling/corrections:
+ [NT] Added some corrections for "remove" etc. Thanks to
Jakub Wilk for spotting those.
@@ -8,6 +14,9 @@ lintian (2.5.3) UNRELEASED; urgency=low
+ [NT] New file. Thanks to Jeremiah C. Foster for the initial
contribution.
+ * lib/Lintian/Collect/Source.pm:
+ + [NT] Removed a requirement for fields that was not needed.
+
-- Niels Thykier <niels@thykier.net> Wed, 10 Aug 2011 21:09:24 +0200
lintian (2.5.2) unstable; urgency=low
diff --git a/lib/Lintian/Collect/Source.pm b/lib/Lintian/Collect/Source.pm
index 407a0b8..98616e0 100644
--- a/lib/Lintian/Collect/Source.pm
+++ b/lib/Lintian/Collect/Source.pm
@@ -169,7 +169,7 @@ sub binary_relation {
# following special field names are supported: build-depends-all
# (build-depends and build-depends-indep) and build-conflicts-all
# (build-conflicts and build-conflicts-indep).
-# sub relation Needs-Info fields
+# sub relation Needs-Info <>
sub relation {
my ($self, $field) = @_;
$field = lc $field;
@@ -198,7 +198,7 @@ sub relation {
# Similar to relation(), return a Lintian::Relation object for the given build
# relationship field, but ignore architecture restrictions. It supports the
# same special field names.
-# sub relation_noarch Needs-Info fields
+# sub relation_noarch Needs-Info <>
sub relation_noarch {
my ($self, $field) = @_;
$field = lc $field;
--
Debian package checker
Reply to: