summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2016-08-20 00:25:34 +0200
committerJulian Andres Klode <jak@debian.org>2016-08-20 00:30:14 +0200
commit99fd3fd5943883d947f2f6cd6a7fd9faf0dcc0bf (patch)
tree3befbf77ff59ef8d9d3d4acd9cd73ee0009233f8
parent29742f9563256f2e9dea409f5a923154a93a9359 (diff)
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
-rw-r--r--debian/apt-transport-https.install (renamed from debian/apt-transport-https.files)0
-rw-r--r--debian/apt.files2
-rw-r--r--debian/apt.install2
-rwxr-xr-xdebian/rules6
4 files changed, 5 insertions, 5 deletions
diff --git a/debian/apt-transport-https.files b/debian/apt-transport-https.install
index 7b14886df..7b14886df 100644
--- a/debian/apt-transport-https.files
+++ b/debian/apt-transport-https.install
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