[SCM] Debian package checker branch, master, updated. 2.5.0-rc3-18-g9d3446a
The following commit has been merged in the master branch:
commit 9d3446a8fc227094def3109b4b22f7672222792d
Author: Niels Thykier <niels@thykier.net>
Date: Tue Apr 26 19:06:09 2011 +0200
Fixed test failures caused by new tags or sloppy test
The duplicate-files triggered in 4 tests. In the new suite these
has been filtered out by the post_test script. In the old suite
they have been added to the tests.
debhelper-internal-files did not explicitly ignore the clean rule.
diff --git a/t/tests/files-python-modules/debian/debian/rules b/t/tests/debhelper-internal-files/debian/debian/rules
old mode 100644
new mode 100755
similarity index 56%
copy from t/tests/files-python-modules/debian/debian/rules
copy to t/tests/debhelper-internal-files/debian/debian/rules
index d769a32..b792adb
--- a/t/tests/files-python-modules/debian/debian/rules
+++ b/t/tests/debhelper-internal-files/debian/debian/rules
@@ -3,5 +3,5 @@
%:
dh $@
-override_dh_pysupport:
-
+clean:
+ # No such thing
diff --git a/t/tests/files-foo-in-bar/post_test b/t/tests/files-foo-in-bar/post_test
new file mode 100644
index 0000000..8538b49
--- /dev/null
+++ b/t/tests/files-foo-in-bar/post_test
@@ -0,0 +1,2 @@
+# Ignore all duplicate-files tags
+/.: .*: duplicate-files .*/ d
diff --git a/t/tests/files-zero-byte-doc/post_test b/t/tests/files-zero-byte-doc/post_test
new file mode 100644
index 0000000..8538b49
--- /dev/null
+++ b/t/tests/files-zero-byte-doc/post_test
@@ -0,0 +1,2 @@
+# Ignore all duplicate-files tags
+/.: .*: duplicate-files .*/ d
diff --git a/testset/tags.binary b/testset/tags.binary
index 23985c5..53bd28a 100644
--- a/testset/tags.binary
+++ b/testset/tags.binary
@@ -136,4 +136,5 @@ W: binary: unquoted-string-in-menu-item usr/lib/menu/binary needs:1
W: binary: unquoted-string-in-menu-item usr/lib/menu/binary needs:2
W: binary: unquoted-string-in-menu-item usr/share/menu/binary needs:1
W: binary: unquoted-string-in-menu-item usr/share/menu/binary needs:2
+X: binary: duplicate-files usr/share/doc/binary/html/ch1.html usr/share/doc/binary/html/ch5.html usr/share/doc/binary/html/index.html
X: binary: package-contains-broken-symlink usr/share/doc/binary/html/ch3.html /usr/share/doc/binary/htm/ch1.html
diff --git a/testset/tags.filenames b/testset/tags.filenames
index 699f8d8..68d07c0 100644
--- a/testset/tags.filenames
+++ b/testset/tags.filenames
@@ -144,5 +144,7 @@ W: filenames: zero-byte-file-in-doc-directory usr/share/doc/filenames/news.debia
W: more-filename-games: binary-without-manpage usr/bin/another-test-game
W: more-filename-games: binary-without-manpage usr/games/yet-another-test-game
W: more-filename-games: package-section-games-but-has-usr-bin
+X: filenames: duplicate-files usr/share/doc/filenames/.DS_Store usr/share/doc/filenames/._NEWS.Debian usr/share/doc/filenames/Thumbs.db usr/share/doc/filenames/link-one
+X: filenames: duplicate-files usr/share/doc/filenames/NEWS.Debian usr/share/doc/filenames/README.macosx usr/share/doc/filenames/examples/__init__.py usr/share/doc/filenames/examples/very_interesting_example
X: filenames: package-contains-broken-symlink usr/lib/filenames/symlink2ok /etc/symlink
X: filenames: package-contains-broken-symlink usr/lib/filenames/symlink3wrong /usr/lib/filenames/symlink2
--
Debian package checker
Reply to: