From 23ecbf33dbcea0025c9a72b8c33f5ffb3e5ae146 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Fri, 19 Aug 2016 17:49:29 +0200 Subject: debian: Make better use of the tree installed by CMake This gets rid of the special casing of etc/apt, various example file installations handled by the upstream build system, and of course the directory creation for all dirs created by the upstream build system. --- debian/apt-doc.docs | 2 -- debian/apt-transport-https.dirs | 1 - debian/apt-utils.dirs | 3 --- debian/apt-utils.examples | 1 - debian/apt.dirs | 19 ------------------- debian/apt.examples | 1 - debian/apt.install | 2 ++ debian/libapt-pkg-doc.docs | 1 - debian/rules | 1 - 9 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 debian/apt-transport-https.dirs delete mode 100644 debian/apt-utils.dirs delete mode 100644 debian/apt-utils.examples delete mode 100644 debian/apt.examples (limited to 'debian') diff --git a/debian/apt-doc.docs b/debian/apt-doc.docs index 2058000c1..3f26b3a2e 100644 --- a/debian/apt-doc.docs +++ b/debian/apt-doc.docs @@ -1,5 +1,3 @@ -build/docs/guide* -build/docs/offline* README.progress-reporting doc/external-dependency-solver-protocol.txt doc/external-installation-planner-protocol.txt diff --git a/debian/apt-transport-https.dirs b/debian/apt-transport-https.dirs deleted file mode 100644 index 3abb3fee8..000000000 --- a/debian/apt-transport-https.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib/apt/methods diff --git a/debian/apt-utils.dirs b/debian/apt-utils.dirs deleted file mode 100644 index de7fa756e..000000000 --- a/debian/apt-utils.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/apt/solvers -usr/lib/apt/planners -usr/bin diff --git a/debian/apt-utils.examples b/debian/apt-utils.examples deleted file mode 100644 index 25aadf996..000000000 --- a/debian/apt-utils.examples +++ /dev/null @@ -1 +0,0 @@ -doc/examples/apt-ftparchive.conf \ No newline at end of file diff --git a/debian/apt.dirs b/debian/apt.dirs index 7d46801df..bdc5adddb 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -1,20 +1 @@ -usr/bin -usr/lib/apt/methods -usr/lib/apt/solvers -usr/lib/apt/planners -usr/lib/dpkg/methods/apt -etc/apt -etc/apt/apt.conf.d -etc/apt/preferences.d -etc/apt/sources.list.d -etc/apt/trusted.gpg.d etc/kernel/postinst.d -etc/logrotate.d -var/cache/apt/archives/partial -var/lib/apt/lists/partial -var/lib/apt/mirrors/partial -var/lib/apt/periodic -var/log/apt -usr/share/bug/apt -usr/share/bash-completion/completions/ -lib/systemd/system/ diff --git a/debian/apt.examples b/debian/apt.examples deleted file mode 100644 index 622ef80b1..000000000 --- a/debian/apt.examples +++ /dev/null @@ -1 +0,0 @@ -build/docs/examples/* diff --git a/debian/apt.install b/debian/apt.install index a8a56c925..42b6df691 100644 --- a/debian/apt.install +++ b/debian/apt.install @@ -1,3 +1,4 @@ +etc/apt/ usr/bin/apt usr/bin/apt-get usr/bin/apt-cache @@ -37,3 +38,4 @@ usr/lib/apt/apt-helper usr/share/doc/apt debian/apt.systemd.daily usr/lib/apt +var/ diff --git a/debian/libapt-pkg-doc.docs b/debian/libapt-pkg-doc.docs index dcacac18b..b57607e31 100644 --- a/debian/libapt-pkg-doc.docs +++ b/debian/libapt-pkg-doc.docs @@ -1,3 +1,2 @@ doc/libapt-pkg2_to_3.txt doc/style.txt -#build/doc/doxygen/html diff --git a/debian/rules b/debian/rules index 1ea0e872b..ab101c2e1 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,6 @@ override_dh_install-indep: override_dh_install-arch: dh_movefiles - if [ -e debian/tmp/etc/apt ]; then dh_install -papt etc/apt/* etc/apt; fi dh_install --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