debian: Get rid of dh_movefiles again

This workaround is a bit more ugly, but does not use a
(somewhat) deprecated debhelper command.

Gbp-Dch: ignore

debian/apt.files

@@ -1,2 +0,0 @@
-usr/lib/apt/solvers/dump
-usr/lib/apt/planners/dump

debian/apt.install

@@ -12,6 +12,8 @@ usr/bin/apt-mark
 usr/lib/*/libapt-private.so*
 usr/lib/apt/apt-helper
 usr/lib/apt/methods/
+usr/lib/apt/planners/dump
+usr/lib/apt/solvers/dump
 usr/lib/dpkg/methods/apt/
 usr/share/bash-completion/completions/
 usr/share/doc/apt

debian/rules

@@ -14,12 +14,12 @@ export CTEST_OUTPUT_ON_FAILURE=1
 	dh $@
 
 override_dh_install-indep:
-	dh_movefiles
 	dh_install --list-missing
 
 override_dh_install-arch:
-	dh_movefiles
-	dh_install --list-missing
+	dh_install -papt-utils -X/dump
+	dh_install -papt -Xmethods/https
+	dh_install --remaining --list-missing
 	install -m 644 debian/apt.conf.autoremove debian/apt/etc/apt/apt.conf.d/01autoremove
 	install -m 755 debian/apt.auto-removal.sh debian/apt/etc/kernel/postinst.d/apt-auto-removal