[SCM] Debian package checker branch, master, updated. 2.5.12-114-gbac2f51
The following commit has been merged in the master branch:
commit bac2f51143684b6025601692af8285bbf07edb93
Author: Niels Thykier <niels@thykier.net>
Date: Wed May 22 22:42:11 2013 +0200
c/files: Drop check for pre-dep on multiarch-support
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/files b/checks/files
index 28000d9..0f4fef6 100644
--- a/checks/files
+++ b/checks/files
@@ -730,17 +730,6 @@ foreach my $file ($info->sorted_index) {
}
}
- if ($type ne 'udeb' && !$index_info->is_symlink && $pkg !~ m/^libc[0-9]/o &&
- $file =~ m,^(?:usr/)?lib/([^/]+)/lib[^/]+\.so(?:\.[^/]+)?$,o) {
- my $subdir = $1;
- # Skip if it not an ELF file (probably a .so script)
- next unless ($info->file_info ($file)//'') =~ m/\bELF\b/o;
- if ($TRIPLETS->known($subdir) && $arch eq $TRIPLETS->value($subdir)) {
- my $dep = $info->relation('pre-depends');
- tag 'missing-pre-dependency-on-multiarch-support' unless ($dep->implies('multiarch-support'));
- }
- }
-
# ---------------- .pyc/.pyo (compiled python files)
# skip any file installed inside a __pycache__ directory
# - we have a separate check for that directory.
diff --git a/checks/files.desc b/checks/files.desc
index 12d571a..dff6202 100644
--- a/checks/files.desc
+++ b/checks/files.desc
@@ -1248,15 +1248,6 @@ Info: The package appears to ship a gzip compressed objects.inv file
option to dh_compress. Newer versions of debhelper handle this
correctly by default.
-Tag: missing-pre-dependency-on-multiarch-support
-Severity: serious
-Certainty: certain
-Info: The package ships a library in one of the multiarch lib directories,
- /lib/<triplet> and /usr/lib/<triplet>, but does not declare a
- pre-dependency on multiarch-support. Packages installing to these
- paths must Pre-Depends: multiarch-support to ensure the library can be
- found by the dynamic linker at every point during an upgrade.
-
Tag: package-contains-no-arch-dependent-files
Severity: minor
Certainty: possible
diff --git a/debian/changelog b/debian/changelog
index 12a0040..5c2ff38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ lintian (2.5.13) UNRELEASED; urgency=low
+ Removed:
- debhelper-maintscript-needs-versioned-build-depends
- debhelper-script-needs-versioned-build-depends
+ - missing-pre-dependency-on-multiarch-support
* checks/*:
+ [NT] Use Lintian::Path objects as arguments to unpacked
@@ -56,6 +57,9 @@ lintian (2.5.13) UNRELEASED; urgency=low
to "Vcs-*" fields that the tags are based on a data list
(and is not a result of a HTTP request while checking the
package).
+ * checks/files{,.desc}:
+ + [JW,NT] Drop missing-pre-dependency-on-multiarch-support
+ now that multiarch-support is in stable. (Closes: #709121)
* checks/group-checks.desc:
+ [NT] Add missing semi-colon in tag description. Thanks to
Andrey Rahmatullin for the report. (Closes: #706827)
diff --git a/private/build-time-data/ftp-master-nonfatal b/private/build-time-data/ftp-master-nonfatal
index 43ffb3b..d8617cc 100644
--- a/private/build-time-data/ftp-master-nonfatal
+++ b/private/build-time-data/ftp-master-nonfatal
@@ -17,7 +17,6 @@ install-info-used-in-maintainer-script
md5sum-mismatch
missing-build-dependency
missing-dependency-on-libc
-missing-pre-dependency-on-multiarch-support
mknod-in-maintainer-script
no-shlibs-control-file
non-etc-file-marked-as-conffile
diff --git a/profiles/debian/ftp-master-auto-reject.profile b/profiles/debian/ftp-master-auto-reject.profile
index 6e18a0e..a05bc02 100644
--- a/profiles/debian/ftp-master-auto-reject.profile
+++ b/profiles/debian/ftp-master-auto-reject.profile
@@ -24,19 +24,18 @@ Enable-Tags: FSSTND-dir-in-usr, FSSTND-dir-in-var, arch-dependent-file-in-usr-sh
maintainer-address-missing, maintainer-name-missing,
maintainer-script-removes-device-files, malformed-deb-archive, md5sum-mismatch,
missing-build-dependency, missing-dependency-on-libc,
- missing-dependency-on-perlapi, missing-pre-dependency-on-multiarch-support,
- mknod-in-maintainer-script, no-architecture-field, no-copyright-file,
- no-maintainer-field, no-package-name, no-shlibs-control-file, no-version-field,
- non-etc-file-marked-as-conffile, not-allowed-control-file,
- package-contains-ancient-file, package-contains-info-dir-file,
- 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-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,
+ missing-dependency-on-perlapi, mknod-in-maintainer-script,
+ no-architecture-field, no-copyright-file, no-maintainer-field, no-package-name,
+ no-shlibs-control-file, no-version-field, non-etc-file-marked-as-conffile,
+ not-allowed-control-file, package-contains-ancient-file,
+ package-contains-info-dir-file, 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-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,
diff --git a/t/tests/binaries-multiarch/desc b/t/tests/binaries-multiarch/desc
index d4622f7..0413e76 100644
--- a/t/tests/binaries-multiarch/desc
+++ b/t/tests/binaries-multiarch/desc
@@ -5,4 +5,3 @@ Description: Test of a correct multiarch package
Architecture: i386 amd64
Test-Against:
triplet-dir-and-architecture-mismatch
- missing-pre-dependency-on-multiarch-support
diff --git a/t/tests/files-multiarch-missing-pre-deps/debian/Makefile b/t/tests/files-multiarch-missing-pre-deps/debian/Makefile
deleted file mode 100644
index 979e366..0000000
--- a/t/tests/files-multiarch-missing-pre-deps/debian/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# Since dpkg in stable (Squeeze) does not support MULTIARCH we cannot use
-# dpkg-architecture -qDEB_HOST_MULTIARCH
-# Therefore this test is hardcoded to x86 and amd64
-
-ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-ifeq (i386,$(ARCH))
- TRIPLET = i386-linux-gnu
-else
- TRIPLET = x86_64-linux-gnu
-endif
-
-
-all:
- gcc $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -fPIC -shared -Wl,-z,defs -Wl,-soname,libbasic.so.2 -o libbasic.so.2 basic.c
-
-install:
- # install it under the correct triplet directory
- install -d $(DESTDIR)/usr/lib/$(TRIPLET)
- install -m 644 -c -s libbasic.so.2 $(DESTDIR)/usr/lib/$(TRIPLET)/libbasic.so.2
-
-clean distclean:
- rm -f libbasic.so.2
-
-check test:
diff --git a/t/tests/files-multiarch-missing-pre-deps/debian/basic.c b/t/tests/files-multiarch-missing-pre-deps/debian/basic.c
deleted file mode 100644
index b7fee65..0000000
--- a/t/tests/files-multiarch-missing-pre-deps/debian/basic.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <stdio.h>
-
-int
-lib_interface(int (*a)(char *))
-{
- char tmp[10];
- int r = a(tmp);
- if (r < 0) {
- fprintf(stderr, "%s\n", tmp);
- }
- return r;
-}
diff --git a/t/tests/files-multiarch-missing-pre-deps/debian/debian/control.in b/t/tests/files-multiarch-missing-pre-deps/debian/debian/control.in
deleted file mode 100644
index 1fd8f17..0000000
--- a/t/tests/files-multiarch-missing-pre-deps/debian/debian/control.in
+++ /dev/null
@@ -1,16 +0,0 @@
-Source: {$srcpkg}
-Priority: extra
-Section: libs
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 9)
-
-Package: libbasic2
-Architecture: any
-Depends: $\{misc:Depends\}, $\{shlibs:Depends\}
-Description: {$description}
- This is a test package designed to exercise some feature or tag of
- Lintian. It is part of the Lintian test suite and may do very odd
- things. It should not be installed like a regular package. It may
- be an empty package.
-
diff --git a/t/tests/files-multiarch-missing-pre-deps/debian/debian/libbasic2.symbols b/t/tests/files-multiarch-missing-pre-deps/debian/debian/libbasic2.symbols
deleted file mode 100644
index c2b8fb3..0000000
--- a/t/tests/files-multiarch-missing-pre-deps/debian/debian/libbasic2.symbols
+++ /dev/null
@@ -1,2 +0,0 @@
-libbasic.so.2 libbasic2 #MINVER#
- lib_interface@Base 1.0
diff --git a/t/tests/files-multiarch-missing-pre-deps/debian/debian/rules b/t/tests/files-multiarch-missing-pre-deps/debian/debian/rules
deleted file mode 100644
index ffff87a..0000000
--- a/t/tests/files-multiarch-missing-pre-deps/debian/debian/rules
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/make -f
-
-# Since dpkg in stable (Squeeze) does not support MULTIARCH we cannot use
-# dpkg-architecture -qDEB_HOST_MULTIARCH
-# Therefore this test is hardcoded to x86 and amd64
-
-ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-ifeq (i386,$(ARCH))
- TRIPLET = i386-linux-gnu
-else
- TRIPLET = x86_64-linux-gnu
-endif
-
-%:
- dh $@
-
-override_dh_makeshlibs:
- # dpkg-dev uses ld.so.conf so if we do not pass the lib directly
- # this will fail on all x86 machines without with libc6 < 2.13-5
- dh_makeshlibs -- -edebian/libbasic2/usr/lib/$(TRIPLET)/libbasic.so.2
diff --git a/t/tests/files-multiarch-missing-pre-deps/desc b/t/tests/files-multiarch-missing-pre-deps/desc
deleted file mode 100644
index 6d976e0..0000000
--- a/t/tests/files-multiarch-missing-pre-deps/desc
+++ /dev/null
@@ -1,7 +0,0 @@
-Testname: files-multiarch-missing-pre-deps
-Sequence: 6000
-Version: 1.0
-Description: Multiarch-related tests but not multiarch itself
-Architecture: i386 amd64
-Test-For:
- missing-pre-dependency-on-multiarch-support
diff --git a/t/tests/files-multiarch-missing-pre-deps/tags b/t/tests/files-multiarch-missing-pre-deps/tags
deleted file mode 100644
index a28866b..0000000
--- a/t/tests/files-multiarch-missing-pre-deps/tags
+++ /dev/null
@@ -1 +0,0 @@
-E: libbasic2: missing-pre-dependency-on-multiarch-support
diff --git a/t/tests/files-multiarch-so-script/debian/Makefile b/t/tests/files-multiarch-so-script/debian/Makefile
deleted file mode 100644
index 516fc33..0000000
--- a/t/tests/files-multiarch-so-script/debian/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# Since dpkg in stable (Squeeze) does not support MULTIARCH we cannot use
-# dpkg-architecture -qDEB_HOST_MULTIARCH
-# Therefore this test is hardcoded to x86 and amd64
-
-ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-ifeq (i386,$(ARCH))
- TRIPLET = i386-linux-gnu
-else
- TRIPLET = x86_64-linux-gnu
-endif
-
-
-all:
- echo "INPUT(libsome.so)" > libbasic.so.2
-
-install:
- # install it under the correct triplet directory
- install -d $(DESTDIR)/usr/lib/$(TRIPLET)
- install -m 644 -c libbasic.so.2 $(DESTDIR)/usr/lib/$(TRIPLET)/libbasic.so.2
-
-clean distclean:
- rm -f libbasic.so.2
-
-check test:
diff --git a/t/tests/files-multiarch-so-script/debian/debian/control.in b/t/tests/files-multiarch-so-script/debian/debian/control.in
deleted file mode 100644
index 1fd8f17..0000000
--- a/t/tests/files-multiarch-so-script/debian/debian/control.in
+++ /dev/null
@@ -1,16 +0,0 @@
-Source: {$srcpkg}
-Priority: extra
-Section: libs
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 9)
-
-Package: libbasic2
-Architecture: any
-Depends: $\{misc:Depends\}, $\{shlibs:Depends\}
-Description: {$description}
- This is a test package designed to exercise some feature or tag of
- Lintian. It is part of the Lintian test suite and may do very odd
- things. It should not be installed like a regular package. It may
- be an empty package.
-
diff --git a/t/tests/files-multiarch-so-script/debian/debian/rules b/t/tests/files-multiarch-so-script/debian/debian/rules
deleted file mode 100644
index ffff87a..0000000
--- a/t/tests/files-multiarch-so-script/debian/debian/rules
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/make -f
-
-# Since dpkg in stable (Squeeze) does not support MULTIARCH we cannot use
-# dpkg-architecture -qDEB_HOST_MULTIARCH
-# Therefore this test is hardcoded to x86 and amd64
-
-ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-ifeq (i386,$(ARCH))
- TRIPLET = i386-linux-gnu
-else
- TRIPLET = x86_64-linux-gnu
-endif
-
-%:
- dh $@
-
-override_dh_makeshlibs:
- # dpkg-dev uses ld.so.conf so if we do not pass the lib directly
- # this will fail on all x86 machines without with libc6 < 2.13-5
- dh_makeshlibs -- -edebian/libbasic2/usr/lib/$(TRIPLET)/libbasic.so.2
diff --git a/t/tests/files-multiarch-so-script/desc b/t/tests/files-multiarch-so-script/desc
deleted file mode 100644
index 7c6f153..0000000
--- a/t/tests/files-multiarch-so-script/desc
+++ /dev/null
@@ -1,7 +0,0 @@
-Testname: files-multiarch-so-script
-Sequence: 6000
-Version: 1.0
-Description: Multiarch-related tests with "so" script
-Architecture: i386 amd64
-Test-Against:
- missing-pre-dependency-on-multiarch-support
diff --git a/t/tests/files-multiarch-so-script/tags b/t/tests/files-multiarch-so-script/tags
deleted file mode 100644
index e69de29..0000000
--
Debian package checker
Reply to: