[SCM] Debian package checker branch, master, updated. 2.5.10-226-g39f55ba
The following commit has been merged in the master branch:
commit 39f55ba457eae7de5b56d9ea342b8c7994b7824f
Author: Niels Thykier <niels@thykier.net>
Date: Wed Oct 24 12:30:15 2012 +0200
Move auto-reject data files from data/ to private/
Prior to profiles, these data files were used to control which tags to
output with the -F command line option. After profiles, they have
only be used to generate debian/ftp-master-auto-reject.profile. Thus
there is no longer a reason to install them.
Use the opportunity to refresh the data files.
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/debian/changelog b/debian/changelog
index b0b677c..72714c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -140,6 +140,8 @@ lintian (2.5.11) UNRELEASED; urgency=low
+ [NT] Add new "tasks" section.
* data/menu-format/add-categories:
+ [NT] New file.
+ * data/output/ftp-master-{,non}fatal:
+ + [NT] Removed, not used at run time.
* data/scripts/interpreters:
+ [NT] Add nodejs as a known interpreter. Thanks to
Marcelo Jorge Vieira for the report.
diff --git a/debian/rules b/debian/rules
index 873c1bd..4e51d53 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,7 @@ allcollect := $(wildcard collection/*)
tagfiles := $(wildcard testset/tags.* t/*/*/tags)
testfiles := $(wildcard t/tests/*/*.desc)
perlprovides := data/fields/perl-provides
+autoreject_data := private/build-time-data/ftp-master-fatal private/build-time-data/ftp-master-nonfatal
onlyrun =
tag =
@@ -34,7 +35,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
endif
profiles: $(profiles)
-$(profiles): $(allchecks) private/generate-profiles.pl
+$(profiles): $(allchecks) $(autoreject_data) private/generate-profiles.pl
private/generate-profiles.pl
api-doc:
diff --git a/data/output/ftp-master-fatal b/private/build-time-data/ftp-master-fatal
similarity index 95%
rename from data/output/ftp-master-fatal
rename to private/build-time-data/ftp-master-fatal
index f8a09f1..bd7b702 100644
--- a/data/output/ftp-master-fatal
+++ b/private/build-time-data/ftp-master-fatal
@@ -2,7 +2,7 @@
# be overridden. It is based on the data file retrieved from
# http://ftp-master.debian.org/static/lintian.tags
#
-# Last updated: 2012-02-19
+# Last updated: 2012-10-24
FSSTND-dir-in-usr
FSSTND-dir-in-var
@@ -57,7 +57,6 @@ section-is-dh_make-template
source-field-does-not-match-pkg-name
symlink-has-too-many-up-segments
too-many-architectures
-udeb-uses-unsupported-compression-for-data-tarball
uploader-address-is-on-localhost
uploader-address-malformed
uploader-name-missing
diff --git a/data/output/ftp-master-nonfatal b/private/build-time-data/ftp-master-nonfatal
similarity index 94%
rename from data/output/ftp-master-nonfatal
rename to private/build-time-data/ftp-master-nonfatal
index 0f0d632..f09174a 100644
--- a/data/output/ftp-master-nonfatal
+++ b/private/build-time-data/ftp-master-nonfatal
@@ -2,7 +2,7 @@
# be overridden (nonfatal tags). It is based on the data file retrieved from
# http://ftp-master.debian.org/static/lintian.tags
#
-# Last updated: 2012-02-19
+# Last updated: 2012-10-24
arch-dependent-file-in-usr-share
arch-independent-package-contains-binary-or-object
@@ -22,6 +22,7 @@ no-shlibs-control-file
non-etc-file-marked-as-conffile
package-contains-info-dir-file
preinst-interpreter-without-predepends
+source-contains-waf-binary
statically-linked-binary
usr-share-doc-symlink-without-dependency
wrong-file-owner-uid-or-gid
diff --git a/private/generate-profiles.pl b/private/generate-profiles.pl
index 7ec885e..50caa98 100755
--- a/private/generate-profiles.pl
+++ b/private/generate-profiles.pl
@@ -39,8 +39,8 @@ foreach my $check (<$root/checks/*.desc>){
push @checks, $cname unless $cname eq 'apache2';
}
-@fatal = read_tags ('data/output/ftp-master-fatal');
-@nonfatal = read_tags ('data/output/ftp-master-nonfatal');
+@fatal = read_tags ('private/build-time-data/ftp-master-fatal');
+@nonfatal = read_tags ('private/build-time-data/ftp-master-nonfatal');
foreach my $dir (@dirs) {
mkdir $dir or fail "mkdir $dir: $!" unless -d $dir;
diff --git a/private/refresh-ftp-master-tags b/private/refresh-ftp-master-tags
index 7f991b3..ce7e3fa 100755
--- a/private/refresh-ftp-master-tags
+++ b/private/refresh-ftp-master-tags
@@ -62,8 +62,8 @@ for my $line (@yaml) {
# Print out the fatal and nonfatal tags to our data files.
my $date = strftime('%Y-%m-%d', gmtime);
-open(NONFATAL, '>', 'data/output/ftp-master-nonfatal')
- or die "Cannot create data/output/ftp-master-nonfatal: $!\n";
+open NONFATAL, '>', 'private/build-time-data/ftp-master-nonfatal'
+ or die "Cannot create private/build-time-data/ftp-master-nonfatal: $!\n";
print NONFATAL <<"EOH";
# This file lists all tags that cause an automatic reject on upload but can
# be overridden (nonfatal tags). It is based on the data file retrieved from
@@ -74,8 +74,8 @@ print NONFATAL <<"EOH";
EOH
print NONFATAL join("\n", sort(@nonfatal), '');
close NONFATAL;
-open(FATAL, '>', 'data/output/ftp-master-fatal')
- or die "Cannot create data/output/ftp-master-fatal: $!\n";
+open FATAL, '>', 'private/build-time-data/ftp-master-fatal'
+ or die "Cannot create private/build-time-data/ftp-master-fatal: $!\n";
print FATAL <<"EOH";
# This file lists all tags that cause an automatic reject on upload and cannot
# be overridden. It is based on the data file retrieved from
diff --git a/profiles/debian/ftp-master-auto-reject.profile b/profiles/debian/ftp-master-auto-reject.profile
index 8148997..a8aba7a 100644
--- a/profiles/debian/ftp-master-auto-reject.profile
+++ b/profiles/debian/ftp-master-auto-reject.profile
@@ -32,11 +32,11 @@ Enable-Tags: FSSTND-dir-in-usr, FSSTND-dir-in-var, arch-dependent-file-in-usr-sh
package-has-no-description, package-installs-python-bytecode,
package-not-lowercase, package-uses-local-diversion,
preinst-interpreter-without-predepends, section-is-dh_make-template,
- source-field-does-not-match-pkg-name, statically-linked-binary,
- symlink-has-too-many-up-segments, too-many-architectures,
- udeb-uses-unsupported-compression-for-data-tarball,
- uploader-address-is-on-localhost, uploader-address-malformed,
- uploader-name-missing, usr-share-doc-symlink-to-foreign-package,
+ source-contains-waf-binary, source-field-does-not-match-pkg-name,
+ statically-linked-binary, symlink-has-too-many-up-segments,
+ too-many-architectures, uploader-address-is-on-localhost,
+ uploader-address-malformed, uploader-name-missing,
+ usr-share-doc-symlink-to-foreign-package,
usr-share-doc-symlink-without-dependency, wrong-file-owner-uid-or-gid
Tags: FSSTND-dir-in-usr, FSSTND-dir-in-var, bad-package-name, bad-relation, bad-version-number,
@@ -63,7 +63,6 @@ Tags: FSSTND-dir-in-usr, FSSTND-dir-in-var, bad-package-name, bad-relation, bad-
package-not-lowercase, package-uses-local-diversion,
section-is-dh_make-template, source-field-does-not-match-pkg-name,
symlink-has-too-many-up-segments, too-many-architectures,
- udeb-uses-unsupported-compression-for-data-tarball,
uploader-address-is-on-localhost, uploader-address-malformed,
uploader-name-missing, usr-share-doc-symlink-to-foreign-package
Overridable: no
--
Debian package checker
Reply to: