[SCM] Debian package checker branch, master, updated. 2.3.0-57-gdd4f8dd
The following commit has been merged in the master branch:
commit dd4f8ddb3d1316eddec5d0e9e7467a037cee9881
Author: Russ Allbery <rra@debian.org>
Date: Sat Jan 2 10:59:38 2010 -0800
Add binary in arch: all package test to new test suite
Add a test for arch-independent-package-contains-binary-or-object to the
new test suite and remove the legacy diffs test suite, now that we cover
everything that it tests.
diff --git a/t/COVERAGE b/t/COVERAGE
index 461f87a..791b944 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -202,7 +202,6 @@ shared-libs shlib-without-PT_GNU_STACK-section
The following tags are only tested by the legacy test suite:
-binaries arch-independent-package-contains-binary-or-object
binaries binary-has-unneeded-section
binaries binary-with-bad-dynamic-table
binaries debug-file-should-use-detached-symbols
@@ -609,9 +608,6 @@ debug
unused-shlib-entry-in-symbols-control-file
version-substvar-for-external-package
-diffs
- arch-independent-package-contains-binary-or-object
-
etcfiles
file-in-etc-not-marked-as-conffile
file-missing-in-md5sums
diff --git a/t/tests/binaries-misplaced/desc b/t/tests/binaries-misplaced/desc
index 0bf77c4..b6ac6b5 100644
--- a/t/tests/binaries-misplaced/desc
+++ b/t/tests/binaries-misplaced/desc
@@ -2,5 +2,6 @@ Testname: binaries-misplaced
Sequence: 6000
Version: 1.0
Description: Test binaries in /etc
-Architecture: any
-Test-For: binary-in-etc
+Test-For:
+ arch-independent-package-contains-binary-or-object
+ binary-in-etc
diff --git a/t/tests/binaries-misplaced/tags b/t/tests/binaries-misplaced/tags
index 42f5efe..ca65c7d 100644
--- a/t/tests/binaries-misplaced/tags
+++ b/t/tests/binaries-misplaced/tags
@@ -1 +1,2 @@
+E: binaries-misplaced: arch-independent-package-contains-binary-or-object ./etc/foo
E: binaries-misplaced: binary-in-etc ./etc/foo
diff --git a/testset/diffs/.bzr/dummy b/testset/diffs/.bzr/dummy
deleted file mode 100644
index 2380f51..0000000
--- a/testset/diffs/.bzr/dummy
+++ /dev/null
@@ -1 +0,0 @@
-Some dummy file to trigger the .bzr in diff check.
diff --git a/testset/diffs/ChangeLog b/testset/diffs/ChangeLog
deleted file mode 100644
index 7fd37e0..0000000
--- a/testset/diffs/ChangeLog
+++ /dev/null
@@ -1 +0,0 @@
-upstream changelog
diff --git a/testset/diffs/Makefile b/testset/diffs/Makefile
deleted file mode 100644
index df9ba4f..0000000
--- a/testset/diffs/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-all: binary
-
-clean:
- rm -f binary
diff --git a/testset/diffs/binary.c b/testset/diffs/binary.c
deleted file mode 100644
index 5e0d16c..0000000
--- a/testset/diffs/binary.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <stdio.h>
-
-int main () {
- printf("Helooooooo nurse! :)\n");
-}
diff --git a/testset/diffs/config.cache b/testset/diffs/config.cache
deleted file mode 100644
index 06cf653..0000000
--- a/testset/diffs/config.cache
+++ /dev/null
@@ -1 +0,0 @@
-cache
diff --git a/testset/diffs/config.log b/testset/diffs/config.log
deleted file mode 100644
index 6bfe6b1..0000000
--- a/testset/diffs/config.log
+++ /dev/null
@@ -1 +0,0 @@
-log
diff --git a/testset/diffs/config.status b/testset/diffs/config.status
deleted file mode 100644
index 8be5547..0000000
--- a/testset/diffs/config.status
+++ /dev/null
@@ -1 +0,0 @@
-status
diff --git a/testset/diffs/configure b/testset/diffs/configure
deleted file mode 100755
index 1f0f380..0000000
--- a/testset/diffs/configure
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-echo cache > config.cache
-echo log > config.log
-echo status > config.status
diff --git a/testset/diffs/debian/changelog b/testset/diffs/debian/changelog
deleted file mode 100644
index 68a7df3..0000000
--- a/testset/diffs/debian/changelog
+++ /dev/null
@@ -1,15 +0,0 @@
-diffs (1-1~lint1) unstable; urgency=low
-
- * Initial version
- (Closes: #123456)
- closes: Bug#123456
- (Closes: #nnnnnn)
- (Closes: #123nnn)
- (Closes: #1, #foo)
- (Closes: #1, Bug#2, #bar)
- (Closes 1 bug)
- (Closes 456712)
- (Closes Bug# 123893)
- (Closes #1239124)
-
- -- Lintian Maintainers <lintian-maint@debian.org> Fri, 7 Mar 2003 12:35:16 -0600
diff --git a/testset/diffs/debian/config.cache b/testset/diffs/debian/config.cache
deleted file mode 100644
index 06cf653..0000000
--- a/testset/diffs/debian/config.cache
+++ /dev/null
@@ -1 +0,0 @@
-cache
diff --git a/testset/diffs/debian/control b/testset/diffs/debian/control
deleted file mode 100644
index 3ea2504..0000000
--- a/testset/diffs/debian/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: diffs
-Section: interpreters
-Priority: extra
-Maintainer: Lintian Maintainers <lintian-maint@debian.org>
-Build-Depends: dpatch
-Standards-Version: 3.5.9
-
-Package: diffs
-Architecture: all
-Depends: test
-Description: test lintian's diff file checks
- 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.
diff --git a/testset/diffs/debian/files b/testset/diffs/debian/files
deleted file mode 100644
index ee2e26d..0000000
--- a/testset/diffs/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-diffs_1-1~lint1_all.deb interpreters extra
diff --git a/testset/diffs/debian/patches/00list b/testset/diffs/debian/patches/00list
deleted file mode 100644
index 139597f..0000000
--- a/testset/diffs/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/testset/diffs/debian/rules b/testset/diffs/debian/rules
deleted file mode 100755
index 61a76d1..0000000
--- a/testset/diffs/debian/rules
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/make -f
-
-package := diffs
-tmp := debian/tmp
-
-build:
- make
-
-binary-arch:
-
-binary-indep:
- install -d $(tmp)/usr/bin/
- install -d $(tmp)/usr/share/doc/$(package)/
- install -d $(tmp)/DEBIAN
-
- install -m 755 binary $(tmp)/usr/bin/$(package)
- gzip -c9 ChangeLog > $(tmp)/usr/share/doc/$(package)/changelog.gz
- gzip -c9 debian/changelog > $(tmp)/usr/share/doc/$(package)/changelog.Debian.gz
-
- dpkg-gencontrol -isp
- dpkg --build $(tmp) ..
-
-binary: binary-arch binary-indep
-
-clean:
- rm -rf $(tmp)
- make clean
- rm -f subdir-good/config.cache subdir-good/config.log subdir-good/config.status
-
-.PHONY: build binary-arch binary-indep binary clean
diff --git a/testset/diffs/debian/substvars b/testset/diffs/debian/substvars
deleted file mode 100644
index 79ad1e4..0000000
--- a/testset/diffs/debian/substvars
+++ /dev/null
@@ -1,2 +0,0 @@
-# This shouldn't be included in the package; it's normally created
-# dynamically and removed on debian/rules clean.
diff --git a/testset/diffs/subdir-bad/config.cache b/testset/diffs/subdir-bad/config.cache
deleted file mode 100644
index 06cf653..0000000
--- a/testset/diffs/subdir-bad/config.cache
+++ /dev/null
@@ -1 +0,0 @@
-cache
diff --git a/testset/diffs/subdir-bad/config.log b/testset/diffs/subdir-bad/config.log
deleted file mode 100644
index 6bfe6b1..0000000
--- a/testset/diffs/subdir-bad/config.log
+++ /dev/null
@@ -1 +0,0 @@
-log
diff --git a/testset/diffs/subdir-bad/config.status b/testset/diffs/subdir-bad/config.status
deleted file mode 100644
index 8be5547..0000000
--- a/testset/diffs/subdir-bad/config.status
+++ /dev/null
@@ -1 +0,0 @@
-status
diff --git a/testset/diffs/subdir-bad/configure b/testset/diffs/subdir-bad/configure
deleted file mode 100755
index 1f0f380..0000000
--- a/testset/diffs/subdir-bad/configure
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-echo cache > config.cache
-echo log > config.log
-echo status > config.status
diff --git a/testset/diffs/subdir-good/config.cache b/testset/diffs/subdir-good/config.cache
deleted file mode 100644
index 06cf653..0000000
--- a/testset/diffs/subdir-good/config.cache
+++ /dev/null
@@ -1 +0,0 @@
-cache
diff --git a/testset/diffs/subdir-good/config.log b/testset/diffs/subdir-good/config.log
deleted file mode 100644
index 6bfe6b1..0000000
--- a/testset/diffs/subdir-good/config.log
+++ /dev/null
@@ -1 +0,0 @@
-log
diff --git a/testset/diffs/subdir-good/config.status b/testset/diffs/subdir-good/config.status
deleted file mode 100644
index 8be5547..0000000
--- a/testset/diffs/subdir-good/config.status
+++ /dev/null
@@ -1 +0,0 @@
-status
diff --git a/testset/diffs/subdir-good/configure b/testset/diffs/subdir-good/configure
deleted file mode 100755
index 1f0f380..0000000
--- a/testset/diffs/subdir-good/configure
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-echo cache > config.cache
-echo log > config.log
-echo status > config.status
diff --git a/testset/diffs/svn-commit.tmp b/testset/diffs/svn-commit.tmp
deleted file mode 100644
index 42b5ab6..0000000
--- a/testset/diffs/svn-commit.tmp
+++ /dev/null
@@ -1 +0,0 @@
-Temporary file left over from failed upstream commit.
diff --git a/testset/diffs_1.orig.tar.gz b/testset/diffs_1.orig.tar.gz
deleted file mode 100644
index 2374b99..0000000
Binary files a/testset/diffs_1.orig.tar.gz and /dev/null differ
diff --git a/testset/tags.diffs b/testset/tags.diffs
deleted file mode 100644
index 33cea69..0000000
--- a/testset/tags.diffs
+++ /dev/null
@@ -1,32 +0,0 @@
-E: diffs source: debian-files-list-in-source
-E: diffs: arch-independent-package-contains-binary-or-object ./usr/bin/diffs
-E: diffs: missing-dependency-on-libc needed by ./usr/bin/diffs
-E: diffs: no-copyright-file
-E: diffs: possible-missing-colon-in-closes Closes #1239124
-E: diffs: possible-missing-colon-in-closes Closes 456712
-E: diffs: possible-missing-colon-in-closes Closes Bug# 123893
-E: diffs: unstripped-binary-or-object ./usr/bin/diffs
-I: diffs source: debian-watch-file-is-missing
-I: diffs: no-md5sums-control-file
-W: diffs source: ancient-standards-version 3.5.9 (current is 3.8.3)
-W: diffs source: configure-generated-file-in-source config.cache
-W: diffs source: configure-generated-file-in-source config.log
-W: diffs source: configure-generated-file-in-source config.status
-W: diffs source: configure-generated-file-in-source subdir-bad/config.cache
-W: diffs source: configure-generated-file-in-source subdir-bad/config.log
-W: diffs source: configure-generated-file-in-source subdir-bad/config.status
-W: diffs source: configure-generated-file-in-source subdir-good/config.cache
-W: diffs source: configure-generated-file-in-source subdir-good/config.log
-W: diffs source: configure-generated-file-in-source subdir-good/config.status
-W: diffs source: diff-contains-bzr-control-dir .bzr
-W: diffs source: diff-contains-substvars debian/substvars
-W: diffs source: patch-system-but-direct-changes-in-diff .bzr/dummy
-W: diffs source: patch-system-but-no-source-readme
-W: diffs: binary-without-manpage usr/bin/diffs
-W: diffs: improbable-bug-number-in-closes 1
-W: diffs: improbable-bug-number-in-closes 1
-W: diffs: improbable-bug-number-in-closes 2
-W: diffs: wrong-bug-number-in-closes l6:#nnnnnn
-W: diffs: wrong-bug-number-in-closes l7:#123nnn
-W: diffs: wrong-bug-number-in-closes l8:#foo
-W: diffs: wrong-bug-number-in-closes l9:#bar
--
Debian package checker
Reply to: