diff --git a/tests/include b/tests/include index 95c9c69..e284b7d 100644 --- a/tests/include +++ b/tests/include @@ -3,7 +3,7 @@ set -eu export LC_ALL=C.UTF-8 trap "rm -rf /tmp/debian-chroot" EXIT INT TERM {{ CMD }} --mode=root --variant=apt --include=doc-debian {{ DIST }} /tmp/debian-chroot {{ MIRROR }} -rm /tmp/debian-chroot/usr/share/doc-base/debian-* +rm /tmp/debian-chroot/usr/share/doc-base/doc-debian.debian-* rm -r /tmp/debian-chroot/usr/share/doc/debian rm -r /tmp/debian-chroot/usr/share/doc/doc-debian rm /tmp/debian-chroot/var/lib/apt/extended_states diff --git a/tests/install-doc-debian b/tests/install-doc-debian index 81cb513..27d7f3e 100644 --- a/tests/install-doc-debian +++ b/tests/install-doc-debian @@ -24,7 +24,7 @@ tar -C /tmp/debian-chroot --owner=0 --group=0 --numeric-owner --sort=name --clam tar tvf /tmp/debian-chroot.tar > doc-debian.tar.list rm /tmp/debian-chroot.tar # delete contents of doc-debian -rm /tmp/debian-chroot/usr/share/doc-base/debian-* +rm /tmp/debian-chroot/usr/share/doc-base/doc-debian.debian-* rm -r /tmp/debian-chroot/usr/share/doc/debian rm -r /tmp/debian-chroot/usr/share/doc/doc-debian # delete real files diff --git a/tests/install-doc-debian-and-test-hooks b/tests/install-doc-debian-and-test-hooks index 6ad36eb..e69066c 100644 --- a/tests/install-doc-debian-and-test-hooks +++ b/tests/install-doc-debian-and-test-hooks @@ -27,7 +27,7 @@ tar -C /tmp/debian-chroot --owner=0 --group=0 --numeric-owner --sort=name --clam tar tvf /tmp/debian-chroot.tar | grep -v ' ./dev' | diff -u doc-debian.tar.list - rm /tmp/debian-chroot.tar # delete contents of doc-debian -rm /tmp/debian-chroot/usr/share/doc-base/debian-* +rm /tmp/debian-chroot/usr/share/doc-base/doc-debian.debian-* rm -r /tmp/debian-chroot/usr/share/doc/debian rm -r /tmp/debian-chroot/usr/share/doc/doc-debian # delete real files diff --git a/tests/multiple-include b/tests/multiple-include index 95e03a5..36f53ec 100644 --- a/tests/multiple-include +++ b/tests/multiple-include @@ -3,7 +3,7 @@ set -eu export LC_ALL=C.UTF-8 trap "rm -rf /tmp/debian-chroot" EXIT INT TERM {{ CMD }} --mode=root --variant=apt --include=doc-debian --include=tzdata {{ DIST }} /tmp/debian-chroot {{ MIRROR }} -rm /tmp/debian-chroot/usr/share/doc-base/debian-* +rm /tmp/debian-chroot/usr/share/doc-base/doc-debian.debian-* rm -r /tmp/debian-chroot/usr/share/doc/debian rm -r /tmp/debian-chroot/usr/share/doc/doc-debian rm /tmp/debian-chroot/usr/share/lintian/overrides/tzdata diff --git a/tests/unpack-doc-debian b/tests/unpack-doc-debian index d3c449e..fe87d13 100644 --- a/tests/unpack-doc-debian +++ b/tests/unpack-doc-debian @@ -21,7 +21,7 @@ fi [ "{{ MODE }}" = "fakechroot" ] && prefix="$prefix fakechroot fakeroot" $prefix {{ CMD }} --mode={{ MODE }} --variant={{ VARIANT }} --include=doc-debian {{ DIST }} /tmp/debian-chroot {{ MIRROR }} # delete contents of doc-debian -rm /tmp/debian-chroot/usr/share/doc-base/debian-* +rm /tmp/debian-chroot/usr/share/doc-base/doc-debian.debian-* rm -r /tmp/debian-chroot/usr/share/doc/debian rm -r /tmp/debian-chroot/usr/share/doc/doc-debian # delete real files