[SCM] Debian package checker branch, master, updated. 2.3.3-24-g6befbc5
The following commit has been merged in the master branch:
commit 6befbc54f4c33bf9b6002bba6d5fcc800bc4999f
Author: Russ Allbery <rra@debian.org>
Date: Sat Mar 20 16:43:49 2010 -0700
Fix md5sums test problems in the etcfiles legacy test suite
* testset/etcfiles/:
+ [RA] Fix problems with the md5sums test suite construction in the
legacy etcfiles test. Thanks, Frank Lin PIAT. (Closes: #573081)
diff --git a/debian/changelog b/debian/changelog
index 2fd542e..e693ff6 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,6 +53,9 @@ lintian (2.3.4) UNRELEASED; urgency=low
+ [ADB] Replace the "please mail comments to the maintainer" request
with a pointer to reportbug.
+ * testset/etcfiles/:
+ + [RA] Fix problems with the md5sums test suite construction in the
+ legacy etcfiles test. Thanks, Frank Lin PIAT. (Closes: #573081)
* t/tests/binaries-multiarch/:
+ [RG] Fix test failure in non-i386 architectures by normalising the
expected output. Thanks, Niko Tyni. (Closes: #568680)
diff --git a/testset/etcfiles/debian/rules b/testset/etcfiles/debian/rules
index 1e58c81..60eb147 100755
--- a/testset/etcfiles/debian/rules
+++ b/testset/etcfiles/debian/rules
@@ -27,14 +27,14 @@ binary-indep:
install -d $(tmp)/DEBIAN
install -m 644 debian/conffiles $(tmp)/DEBIAN
- echo '68b329da9893e34099c7d8ad5cb9c940 ./etc/cron.daily/cronfile-normal' \
- > debian/tmp/DEBIAN/md5sums
- echo '68b329da9893e34099c7d8ad5cb9c940 ./etc/cron.daily/.cronfile-begins-with-fullstop' \
- > debian/tmp/DEBIAN/md5sums
- echo '68b329da9893e34099c7d8ad5cb9c940 ./etc/cron.daily/cronfile-contains.fullstop' \
- > debian/tmp/DEBIAN/md5sums
- echo 'ab371382468880299e5ebd05921764ce ./etc/proper' \
+ echo 'd41d8cd98f00b204e9800998ecf8427e ./etc/cron.daily/cronfile-normal' \
> debian/tmp/DEBIAN/md5sums
+ echo 'd41d8cd98f00b204e9800998ecf8427e ./etc/cron.daily/.cronfile-begins-with-fullstop' \
+ >> debian/tmp/DEBIAN/md5sums
+ echo 'd41d8cd98f00b204e9800998ecf8427e ./etc/cron.daily/cronfile-contains.fullstop' \
+ >> debian/tmp/DEBIAN/md5sums
+ echo '05c72cacce994208128b7d081116b04a ./etc/proper' \
+ >> debian/tmp/DEBIAN/md5sums
echo 'ab371382468880299e5ebd05921764ce etc/improper' \
>> debian/tmp/DEBIAN/md5sums
echo 'ab371382468880299e5ebd05921764ce usr/bin/foo' \
diff --git a/testset/tags.etcfiles b/testset/tags.etcfiles
index 99b3c25..04b18db 100644
--- a/testset/tags.etcfiles
+++ b/testset/tags.etcfiles
@@ -3,9 +3,8 @@ E: etcfiles source: not-binnmuable-all-depends-any only-etcfiles -> etcfiles
E: etcfiles: changelog-file-not-compressed changelog
E: etcfiles: file-in-etc-not-marked-as-conffile /etc/improper
E: etcfiles: file-in-etc-not-marked-as-conffile /etc/improper-link
-E: etcfiles: malformed-md5sums-control-file line 4
+E: etcfiles: malformed-md5sums-control-file line 7
E: etcfiles: md5sum-mismatch etc/improper
-E: etcfiles: md5sum-mismatch etc/proper
E: etcfiles: md5sums-lists-nonexisting-file usr/bin/foo
E: etcfiles: no-copyright-file
E: etcfiles: non-etc-file-marked-as-conffile /var/lib/foo
--
Debian package checker
Reply to: