[lintian] 01/04: t: Update tests to fix FTBFS
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch stretch
in repository lintian.
commit e0ef0602207306a229aa24c33e71be8ecdac48aa
Author: Niels Thykier <niels@thykier.net>
Date: Sat May 20 11:38:33 2017 +0000
t: Update tests to fix FTBFS
Signed-off-by: Niels Thykier <niels@thykier.net>
---
debian/changelog | 8 ++++++++
t/tests/cruft-general-diff/debian/debian/files | 1 -
t/tests/cruft-general-diff/desc | 1 -
t/tests/cruft-general-diff/tags | 1 -
t/tests/cruft-general-native/debian/debian/files | 1 -
t/tests/cruft-general-native/desc | 1 -
t/tests/cruft-general-native/tags | 1 -
t/tests/cruft-general-quilt/debian/debian/files | 1 -
t/tests/cruft-general-quilt/desc | 1 -
t/tests/cruft-general-quilt/tags | 1 -
t/tests/cruft-general-wig-pen/debian/debian/files | 1 -
t/tests/cruft-general-wig-pen/desc | 1 -
t/tests/cruft-general-wig-pen/tags | 1 -
13 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 08a91f4..b220ffb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lintian (2.5.50.4) UNRELEASED; urgency=medium
+
+ * t/*:
+ + [NT] Update tests to fix FTBFS caused by dpkg-source now ignoring
+ debian/files by default. (Closes: #863020)
+
+ -- Niels Thykier <niels@thykier.net> Sun, 30 Apr 2017 13:12:39 +0000
+
lintian (2.5.50.3) unstable; urgency=medium
* t/tests/java-jars:
diff --git a/t/tests/cruft-general-diff/debian/debian/files b/t/tests/cruft-general-diff/debian/debian/files
deleted file mode 100644
index 4c0ddb3..0000000
--- a/t/tests/cruft-general-diff/debian/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-cruft-general-diff_1.0-1_all.deb devel extra
diff --git a/t/tests/cruft-general-diff/desc b/t/tests/cruft-general-diff/desc
index 2286750..360d0ea 100644
--- a/t/tests/cruft-general-diff/desc
+++ b/t/tests/cruft-general-diff/desc
@@ -3,7 +3,6 @@ Version: 1.0-1
Type: non-native
Description: Check for cruft added in the diff
Test-For:
- debian-files-list-in-source
diff-contains-arch-control-dir
diff-contains-arch-inventory-file
diff-contains-bts-control-dir
diff --git a/t/tests/cruft-general-diff/tags b/t/tests/cruft-general-diff/tags
index 1067251..5b16ac1 100644
--- a/t/tests/cruft-general-diff/tags
+++ b/t/tests/cruft-general-diff/tags
@@ -1,4 +1,3 @@
-E: cruft-general-diff source: debian-files-list-in-source
E: cruft-general-diff source: diff-contains-cmake-cache-file CMakeCache.txt
W: cruft-general-diff source: diff-contains-arch-control-dir {arch}
W: cruft-general-diff source: diff-contains-arch-inventory-file .arch-inventory
diff --git a/t/tests/cruft-general-native/debian/debian/files b/t/tests/cruft-general-native/debian/debian/files
deleted file mode 100644
index d07dc14..0000000
--- a/t/tests/cruft-general-native/debian/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-cruft-general-native_1.0_all.deb devel extra
diff --git a/t/tests/cruft-general-native/desc b/t/tests/cruft-general-native/desc
index 62be372..9104042 100644
--- a/t/tests/cruft-general-native/desc
+++ b/t/tests/cruft-general-native/desc
@@ -3,7 +3,6 @@ Version: 1.0
Type: native
Description: Check for cruft in a native package
Test-For:
- debian-files-list-in-source
diff-contains-arch-control-dir
diff-contains-arch-inventory-file
diff-contains-bts-control-dir
diff --git a/t/tests/cruft-general-native/tags b/t/tests/cruft-general-native/tags
index be904c0..4f9ff14 100644
--- a/t/tests/cruft-general-native/tags
+++ b/t/tests/cruft-general-native/tags
@@ -1,4 +1,3 @@
-E: cruft-general-native source: debian-files-list-in-source
W: cruft-general-native source: diff-contains-arch-control-dir {arch}
W: cruft-general-native source: diff-contains-arch-inventory-file .arch-inventory
W: cruft-general-native source: diff-contains-bts-control-dir .be
diff --git a/t/tests/cruft-general-quilt/debian/debian/files b/t/tests/cruft-general-quilt/debian/debian/files
deleted file mode 100644
index 812cef3..0000000
--- a/t/tests/cruft-general-quilt/debian/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-cruft-general-quilt_1.0-1_all.deb devel extra
diff --git a/t/tests/cruft-general-quilt/desc b/t/tests/cruft-general-quilt/desc
index cd022c5..10632f8 100644
--- a/t/tests/cruft-general-quilt/desc
+++ b/t/tests/cruft-general-quilt/desc
@@ -3,7 +3,6 @@ Version: 1.0-1
Type: non-native
Description: Check for cruft added in a 3.0 (quilt) package
Test-For:
- debian-files-list-in-source
diff-contains-arch-control-dir
diff-contains-arch-inventory-file
diff-contains-bts-control-dir
diff --git a/t/tests/cruft-general-quilt/tags b/t/tests/cruft-general-quilt/tags
index 1362016..ff138be 100644
--- a/t/tests/cruft-general-quilt/tags
+++ b/t/tests/cruft-general-quilt/tags
@@ -1,4 +1,3 @@
-E: cruft-general-quilt source: debian-files-list-in-source
W: cruft-general-quilt source: diff-contains-arch-control-dir debian/{arch}
W: cruft-general-quilt source: diff-contains-arch-inventory-file debian/.arch-inventory
W: cruft-general-quilt source: diff-contains-bts-control-dir debian/.be
diff --git a/t/tests/cruft-general-wig-pen/debian/debian/files b/t/tests/cruft-general-wig-pen/debian/debian/files
deleted file mode 100644
index 26d6815..0000000
--- a/t/tests/cruft-general-wig-pen/debian/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-cruft-general-wig-pen_1.0-1_all.deb devel extra
diff --git a/t/tests/cruft-general-wig-pen/desc b/t/tests/cruft-general-wig-pen/desc
index 65c29e6..a8d5058 100644
--- a/t/tests/cruft-general-wig-pen/desc
+++ b/t/tests/cruft-general-wig-pen/desc
@@ -3,7 +3,6 @@ Version: 1.0-1
Type: non-native
Description: Check for cruft added in a 2.0 package
Test-For:
- debian-files-list-in-source
diff-contains-arch-control-dir
diff-contains-arch-inventory-file
diff-contains-bts-control-dir
diff --git a/t/tests/cruft-general-wig-pen/tags b/t/tests/cruft-general-wig-pen/tags
index d7e11ab..78874f4 100644
--- a/t/tests/cruft-general-wig-pen/tags
+++ b/t/tests/cruft-general-wig-pen/tags
@@ -1,4 +1,3 @@
-E: cruft-general-wig-pen source: debian-files-list-in-source
E: cruft-general-wig-pen source: unsupported-source-format 2.0
W: cruft-general-wig-pen source: diff-contains-arch-control-dir debian/{arch}
W: cruft-general-wig-pen source: diff-contains-arch-inventory-file debian/.arch-inventory
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: