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

diff --git a/debian/apt-transport-https.files b/debian/apt-transport-https.files
deleted file mode 100644 (file)
index 7b14886..0000000
--- a/debian/apt-transport-https.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/apt/methods/https

diff --git a/debian/apt-transport-https.install b/debian/apt-transport-https.install
new file mode 100644 (file)
index 0000000..7b14886
--- /dev/null
+++ b/debian/apt-transport-https.install
@@ -0,0 +1 @@
+usr/lib/apt/methods/https

diff --git a/debian/apt.files b/debian/apt.files
deleted file mode 100644 (file)
index 5724751..0000000
--- a/debian/apt.files
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/apt/solvers/dump
-usr/lib/apt/planners/dump

diff --git a/debian/apt.install b/debian/apt.install
index 82f2f080664cc8cd567d40784c5638705eb86b5e..2c2187849cbb3bf7eb3246d058cd6da853a27b6b 100644 (file)
--- a/debian/apt.install
+++ b/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

diff --git a/debian/rules b/debian/rules
index cc2e36fbae00b8f46005cb6f2655beb38dbdfa32..24608a6b8eb575c8d0bd14deea40f8e8bfc220b2 100755 (executable)
--- a/debian/rules
+++ b/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