[SCM] Debian package checker branch, master, updated. 2.5.4-52-g2d97d86
The following commit has been merged in the master branch:
commit 2d97d86fc27bd69a47e014cfd9e2d01c035491b1
Author: Niels Thykier <niels@thykier.net>
Date: Wed Dec 21 17:20:11 2011 +0100
Added missing check for file overlaps
Also fixed a description issue with another test.
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/t/COVERAGE b/t/COVERAGE
index 8df217a..cff66a5 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
-Last generated 2011-12-08
-Coverage: 779/949 (82.09%), w. legacy tests: 887/949 (93.47%)
+Last generated 2011-12-21
+Coverage: 781/951 (82.12%), w. legacy tests: 889/951 (93.48%)
The following tags are not tested by the test suite:
diff --git a/t/tests/basic-3.0-native/debian/README b/t/tests/group-checks-file-conflict/debian/data-file
similarity index 100%
copy from t/tests/basic-3.0-native/debian/README
copy to t/tests/group-checks-file-conflict/debian/data-file
diff --git a/t/tests/group-checks-wrong-priorities/debian/debian/control.in b/t/tests/group-checks-file-conflict/debian/debian/control.in
similarity index 75%
copy from t/tests/group-checks-wrong-priorities/debian/debian/control.in
copy to t/tests/group-checks-file-conflict/debian/debian/control.in
index ce480e7..9a2d6cf 100644
--- a/t/tests/group-checks-wrong-priorities/debian/debian/control.in
+++ b/t/tests/group-checks-file-conflict/debian/debian/control.in
@@ -5,23 +5,22 @@ Maintainer: {$author}
Standards-Version: {$standards_version}
Build-Depends: debhelper (>= 7.0.50~)
-Package: pkg-optional
+Package: pkga
Architecture: all
-Priority: optional
-Depends: $\{misc:Depends\}, pkg-extra
-Description: {$description} - pkg-optional
+Depends: $\{misc:Depends\}
+Description: {$description} - pkga
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.
.
- optional.
+ pkga.
-Package: pkg-extra
+Package: pkgb
Architecture: all
Depends: $\{misc:Depends\}
-Description: {$description} - pkg-extra
+Description: {$description} - pkgb
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.
.
- extra.
+ pkgb.
diff --git a/t/tests/group-checks-file-conflict/debian/debian/rules b/t/tests/group-checks-file-conflict/debian/debian/rules
new file mode 100644
index 0000000..8e256c8
--- /dev/null
+++ b/t/tests/group-checks-file-conflict/debian/debian/rules
@@ -0,0 +1,9 @@
+#!/usr/bin/make -f
+
+%:
+ dh $@
+
+override_dh_install:
+ for P in $$(dh_listpackages) ; do \
+ dh_install -p$$P data-file usr/share/pkga/ || exit 1 ;\
+ done
diff --git a/t/tests/group-checks-file-conflict/desc b/t/tests/group-checks-file-conflict/desc
new file mode 100644
index 0000000..b34be68
--- /dev/null
+++ b/t/tests/group-checks-file-conflict/desc
@@ -0,0 +1,5 @@
+Testname: group-checks-file-conflict
+Sequence: 6000
+Version: 1.0
+Description: Test for overlapping files
+Test-For: binaries-have-file-conflict
diff --git a/t/tests/group-checks-file-conflict/tags b/t/tests/group-checks-file-conflict/tags
new file mode 100644
index 0000000..64b0949
--- /dev/null
+++ b/t/tests/group-checks-file-conflict/tags
@@ -0,0 +1 @@
+W: group-checks-file-conflict source: binaries-have-file-conflict pkga pkgb usr/share/pkga/data-file
diff --git a/t/tests/group-checks-wrong-priorities/desc b/t/tests/group-checks-wrong-priorities/desc
index 0cb541a..00dcd22 100644
--- a/t/tests/group-checks-wrong-priorities/desc
+++ b/t/tests/group-checks-wrong-priorities/desc
@@ -1,5 +1,5 @@
Testname: group-checks-wrong-priorities
Sequence: 6000
Version: 1.0
-Description: Test for circular dependencies
+Description: Test for priority issues
Test-For: package-depends-on-lower-priority-package
--
Debian package checker
Reply to: