README.md

@@ -23,11 +23,6 @@ For the full documentation use:
 
     pod2man ./mmdebstrap | man -l -
 
-Or read a HTML version of the man page in either of these locations:
-
- - https://gitlab.mister-muffin.de/josch/mmdebstrap/wiki
- - https://manpages.debian.org/unstable/mmdebstrap/mmdebstrap.1.en.html
-
 The sales pitch in comparison to debootstrap
 --------------------------------------------
 
@@ -164,7 +159,6 @@ Contributors
  - Josh Triplett
  - Konstantin Demin
  - David Kalnischkies
- - Emilio Pozuelo Monfort
  - Jakub Wilk
  - Joe Groocock
  - Nicolas Vigier

tests/eatmydata-via-hook-dir

@@ -34,10 +34,6 @@ elfheader="$elfheader\\001\\000"
 	--hook-dir=./hooks/eatmydata \
 	--customize-hook='printf "'"$elfheader"'" | cmp --bytes=8 - "$1"/usr/bin/dpkg' \
 	 {{ DIST }} /tmp/debian-chroot {{ MIRROR }}
- tar -C /tmp/debian-chroot --one-file-system -c . \
+tar -C /tmp/debian-chroot --one-file-system -c . | tar -t | sort | diff -u tar1.txt -
-	 | tar -t \
-	 | sort \
-	 | grep -v '^\./var/lib/dpkg/diversions\(-old\)\?$' \
-	 | diff -u tar1.txt -
 rm /tmp/checkeatmydata.sh
 rm -r /tmp/debian-chroot

tests/jessie-or-older

@@ -29,7 +29,6 @@ filter() {
 		--path-exclude=/var/cache/debconf/config.dat-old \
 		--path-exclude=/var/cache/debconf/templates.dat-old \
 		--path-exclude=/var/lib/dpkg/available \
-		--path-exclude=/var/lib/dpkg/diversions \
 		--path-exclude=/var/lib/dpkg/cmethopt \
 		--path-exclude=/var/lib/dpkg/status-old \
 		--path-exclude=/var/lib/shells.state