[SCM] Debian package checker branch, master, updated. 2.5.10-201-gdb61869
The following commit has been merged in the master branch:
commit db618690b676717f93d53e71c7ec1f1373e0079b
Author: Niels Thykier <niels@thykier.net>
Date: Sat Oct 13 12:49:49 2012 +0200
L::Data: Restore the old data dir
Move the "core" data files back to "data/" and search "data/" after
the vendor directories.
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/data b/data
deleted file mode 120000
index c9e6c2e..0000000
--- a/data
+++ /dev/null
@@ -1 +0,0 @@
-vendors/debian/ftp-master-auto-reject/data
\ No newline at end of file
diff --git a/vendors/debian/ftp-master-auto-reject/data/README b/data/README
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/README
rename to data/README
diff --git a/vendors/debian/ftp-master-auto-reject/data/binaries/arch-64bit-equivs b/data/binaries/arch-64bit-equivs
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/binaries/arch-64bit-equivs
rename to data/binaries/arch-64bit-equivs
diff --git a/vendors/debian/ftp-master-auto-reject/data/binaries/arch-regex b/data/binaries/arch-regex
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/binaries/arch-regex
rename to data/binaries/arch-regex
diff --git a/vendors/debian/ftp-master-auto-reject/data/binaries/embedded-libs b/data/binaries/embedded-libs
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/binaries/embedded-libs
rename to data/binaries/embedded-libs
diff --git a/vendors/debian/ftp-master-auto-reject/data/binaries/hardening-tags b/data/binaries/hardening-tags
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/binaries/hardening-tags
rename to data/binaries/hardening-tags
diff --git a/vendors/debian/ftp-master-auto-reject/data/binaries/multiarch-dirs b/data/binaries/multiarch-dirs
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/binaries/multiarch-dirs
rename to data/binaries/multiarch-dirs
diff --git a/vendors/debian/ftp-master-auto-reject/data/changes-file/known-dists b/data/changes-file/known-dists
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/changes-file/known-dists
rename to data/changes-file/known-dists
diff --git a/vendors/debian/ftp-master-auto-reject/data/common/architectures b/data/common/architectures
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/common/architectures
rename to data/common/architectures
diff --git a/vendors/debian/ftp-master-auto-reject/data/common/priorities b/data/common/priorities
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/common/priorities
rename to data/common/priorities
diff --git a/vendors/debian/ftp-master-auto-reject/data/common/source-fields b/data/common/source-fields
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/common/source-fields
rename to data/common/source-fields
diff --git a/vendors/debian/ftp-master-auto-reject/data/control-files/deb-permissions b/data/control-files/deb-permissions
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/control-files/deb-permissions
rename to data/control-files/deb-permissions
diff --git a/vendors/debian/ftp-master-auto-reject/data/control-files/udeb-permissions b/data/control-files/udeb-permissions
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/control-files/udeb-permissions
rename to data/control-files/udeb-permissions
diff --git a/vendors/debian/ftp-master-auto-reject/data/cruft/autotools b/data/cruft/autotools
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/cruft/autotools
rename to data/cruft/autotools
diff --git a/vendors/debian/ftp-master-auto-reject/data/debhelper/dh_addons b/data/debhelper/dh_addons
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/debhelper/dh_addons
rename to data/debhelper/dh_addons
diff --git a/vendors/debian/ftp-master-auto-reject/data/debhelper/dh_addons-manual b/data/debhelper/dh_addons-manual
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/debhelper/dh_addons-manual
rename to data/debhelper/dh_addons-manual
diff --git a/vendors/debian/ftp-master-auto-reject/data/debhelper/dh_commands b/data/debhelper/dh_commands
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/debhelper/dh_commands
rename to data/debhelper/dh_commands
diff --git a/vendors/debian/ftp-master-auto-reject/data/debhelper/dh_commands-manual b/data/debhelper/dh_commands-manual
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/debhelper/dh_commands-manual
rename to data/debhelper/dh_commands-manual
diff --git a/vendors/debian/ftp-master-auto-reject/data/debhelper/dh_packages b/data/debhelper/dh_packages
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/debhelper/dh_packages
rename to data/debhelper/dh_packages
diff --git a/vendors/debian/ftp-master-auto-reject/data/debhelper/filename-config-files b/data/debhelper/filename-config-files
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/debhelper/filename-config-files
rename to data/debhelper/filename-config-files
diff --git a/vendors/debian/ftp-master-auto-reject/data/debhelper/maint_commands b/data/debhelper/maint_commands
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/debhelper/maint_commands
rename to data/debhelper/maint_commands
diff --git a/vendors/debian/ftp-master-auto-reject/data/debhelper/miscDepends_commands b/data/debhelper/miscDepends_commands
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/debhelper/miscDepends_commands
rename to data/debhelper/miscDepends_commands
diff --git a/vendors/debian/ftp-master-auto-reject/data/debian-source-dir/known-files b/data/debian-source-dir/known-files
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/debian-source-dir/known-files
rename to data/debian-source-dir/known-files
diff --git a/vendors/debian/ftp-master-auto-reject/data/doc-base/sections b/data/doc-base/sections
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/doc-base/sections
rename to data/doc-base/sections
diff --git a/vendors/debian/ftp-master-auto-reject/data/fields/archive-sections b/data/fields/archive-sections
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/fields/archive-sections
rename to data/fields/archive-sections
diff --git a/vendors/debian/ftp-master-auto-reject/data/fields/binary-fields b/data/fields/binary-fields
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/fields/binary-fields
rename to data/fields/binary-fields
diff --git a/vendors/debian/ftp-master-auto-reject/data/fields/bounce-addresses b/data/fields/bounce-addresses
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/fields/bounce-addresses
rename to data/fields/bounce-addresses
diff --git a/vendors/debian/ftp-master-auto-reject/data/fields/build-essential-packages b/data/fields/build-essential-packages
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/fields/build-essential-packages
rename to data/fields/build-essential-packages
diff --git a/vendors/debian/ftp-master-auto-reject/data/fields/essential b/data/fields/essential
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/fields/essential
rename to data/fields/essential
diff --git a/vendors/debian/ftp-master-auto-reject/data/fields/metapackages b/data/fields/metapackages
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/fields/metapackages
rename to data/fields/metapackages
diff --git a/vendors/debian/ftp-master-auto-reject/data/fields/no-build-depends b/data/fields/no-build-depends
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/fields/no-build-depends
rename to data/fields/no-build-depends
diff --git a/vendors/debian/ftp-master-auto-reject/data/fields/obsolete-packages b/data/fields/obsolete-packages
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/fields/obsolete-packages
rename to data/fields/obsolete-packages
diff --git a/vendors/debian/ftp-master-auto-reject/data/fields/perl-provides b/data/fields/perl-provides
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/fields/perl-provides
rename to data/fields/perl-provides
diff --git a/vendors/debian/ftp-master-auto-reject/data/fields/udeb-fields b/data/fields/udeb-fields
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/fields/udeb-fields
rename to data/fields/udeb-fields
diff --git a/vendors/debian/ftp-master-auto-reject/data/fields/virtual-packages b/data/fields/virtual-packages
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/fields/virtual-packages
rename to data/fields/virtual-packages
diff --git a/vendors/debian/ftp-master-auto-reject/data/files/fonts b/data/files/fonts
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/files/fonts
rename to data/files/fonts
diff --git a/vendors/debian/ftp-master-auto-reject/data/files/incorrect-locale-codes b/data/files/incorrect-locale-codes
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/files/incorrect-locale-codes
rename to data/files/incorrect-locale-codes
diff --git a/vendors/debian/ftp-master-auto-reject/data/files/locale-codes b/data/files/locale-codes
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/files/locale-codes
rename to data/files/locale-codes
diff --git a/vendors/debian/ftp-master-auto-reject/data/files/standard-files b/data/files/standard-files
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/files/standard-files
rename to data/files/standard-files
diff --git a/vendors/debian/ftp-master-auto-reject/data/files/triplets b/data/files/triplets
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/files/triplets
rename to data/files/triplets
diff --git a/vendors/debian/ftp-master-auto-reject/data/init.d/virtual_facilities b/data/init.d/virtual_facilities
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/init.d/virtual_facilities
rename to data/init.d/virtual_facilities
diff --git a/vendors/debian/ftp-master-auto-reject/data/menu-format/add-categories b/data/menu-format/add-categories
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/menu-format/add-categories
rename to data/menu-format/add-categories
diff --git a/vendors/debian/ftp-master-auto-reject/data/menu-format/menu-sections b/data/menu-format/menu-sections
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/menu-format/menu-sections
rename to data/menu-format/menu-sections
diff --git a/vendors/debian/ftp-master-auto-reject/data/output/ftp-master-fatal b/data/output/ftp-master-fatal
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/output/ftp-master-fatal
rename to data/output/ftp-master-fatal
diff --git a/vendors/debian/ftp-master-auto-reject/data/output/ftp-master-nonfatal b/data/output/ftp-master-nonfatal
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/output/ftp-master-nonfatal
rename to data/output/ftp-master-nonfatal
diff --git a/vendors/debian/ftp-master-auto-reject/data/output/manual-references b/data/output/manual-references
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/output/manual-references
rename to data/output/manual-references
diff --git a/vendors/debian/ftp-master-auto-reject/data/rules/deprecated-makefiles b/data/rules/deprecated-makefiles
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/rules/deprecated-makefiles
rename to data/rules/deprecated-makefiles
diff --git a/vendors/debian/ftp-master-auto-reject/data/rules/known-makefiles b/data/rules/known-makefiles
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/rules/known-makefiles
rename to data/rules/known-makefiles
diff --git a/vendors/debian/ftp-master-auto-reject/data/scripts/interpreters b/data/scripts/interpreters
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/scripts/interpreters
rename to data/scripts/interpreters
diff --git a/vendors/debian/ftp-master-auto-reject/data/scripts/versioned-interpreters b/data/scripts/versioned-interpreters
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/scripts/versioned-interpreters
rename to data/scripts/versioned-interpreters
diff --git a/vendors/debian/ftp-master-auto-reject/data/shared-libs/hwcap-dirs b/data/shared-libs/hwcap-dirs
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/shared-libs/hwcap-dirs
rename to data/shared-libs/hwcap-dirs
diff --git a/vendors/debian/ftp-master-auto-reject/data/shared-libs/ldconfig-dirs b/data/shared-libs/ldconfig-dirs
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/shared-libs/ldconfig-dirs
rename to data/shared-libs/ldconfig-dirs
diff --git a/vendors/debian/ftp-master-auto-reject/data/spelling/corrections b/data/spelling/corrections
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/spelling/corrections
rename to data/spelling/corrections
diff --git a/vendors/debian/ftp-master-auto-reject/data/spelling/corrections-case b/data/spelling/corrections-case
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/spelling/corrections-case
rename to data/spelling/corrections-case
diff --git a/vendors/debian/ftp-master-auto-reject/data/spelling/corrections-multiword b/data/spelling/corrections-multiword
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/spelling/corrections-multiword
rename to data/spelling/corrections-multiword
diff --git a/vendors/debian/ftp-master-auto-reject/data/standards-version/release-dates b/data/standards-version/release-dates
similarity index 100%
rename from vendors/debian/ftp-master-auto-reject/data/standards-version/release-dates
rename to data/standards-version/release-dates
diff --git a/debian/lintian.install b/debian/lintian.install
index 4f2b812..bd316ad 100644
--- a/debian/lintian.install
+++ b/debian/lintian.install
@@ -2,6 +2,7 @@ frontend/lintian usr/bin
frontend/lintian-info usr/bin
checks usr/share/lintian
collection usr/share/lintian
+data usr/share/lintian
lib/Lintian usr/share/perl5
profiles usr/share/lintian
vendors usr/share/lintian
diff --git a/lib/Lintian/Data.pm b/lib/Lintian/Data.pm
index a0e757f..7000ccc 100644
--- a/lib/Lintian/Data.pm
+++ b/lib/Lintian/Data.pm
@@ -108,6 +108,15 @@ sub new {
}
}
}
+ if (not defined $file and $cur == scalar @$vendors) {
+ foreach my $datafile ($profile->include_path ("data/$type")) {
+ if ( -f $datafile) {
+ $file = $datafile;
+ last;
+ }
+ }
+ $cur++;
+ }
if (not defined $file) {
croak "Unknown data file: $type" unless $start;
croak "No parent data file for $vendors->[$start]";
@@ -120,7 +129,8 @@ sub new {
sub _parse_file {
my ($self, $type, $fd, $dataset, $separator, $code, $vendors, $vno) = @_;
- my $filename = $vendors->[$vno] . '/' . $type;
+ my $filename = $type;
+ $filename = $vendors->[$vno] . '/' . $type if $vno < scalar @$vendors;
local ($_, $.);
while (<$fd>) {
chomp;
--
Debian package checker
Reply to: