From 99fd3fd5943883d947f2f6cd6a7fd9faf0dcc0bf Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 20 Aug 2016 00:25:34 +0200 Subject: 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-transport-https.files | 1 - debian/apt-transport-https.install | 1 + debian/apt.files | 2 -- debian/apt.install | 2 ++ debian/rules | 6 +++--- 5 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 debian/apt-transport-https.files create mode 100644 debian/apt-transport-https.install delete mode 100644 debian/apt.files (limited to 'debian') diff --git a/debian/apt-transport-https.files b/debian/apt-transport-https.files deleted file mode 100644 index 7b14886df..000000000 --- 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 index 000000000..7b14886df --- /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 index 572475192..000000000 --- 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 82f2f0806..2c2187849 100644 --- 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 cc2e36fba..24608a6b8 100755 --- 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 -- cgit v1.2.3