Browse Source

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.
Julian Andres Klode 7 years ago
parent
commit
23ecbf33db

+ 0 - 2
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

+ 0 - 1
debian/apt-transport-https.dirs

@@ -1 +0,0 @@
-usr/lib/apt/methods

+ 0 - 3
debian/apt-utils.dirs

@@ -1,3 +0,0 @@
-usr/lib/apt/solvers
-usr/lib/apt/planners
-usr/bin

+ 0 - 1
debian/apt-utils.examples

@@ -1 +0,0 @@
-doc/examples/apt-ftparchive.conf

+ 0 - 19
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/

+ 0 - 1
debian/apt.examples

@@ -1 +0,0 @@
-build/docs/examples/*

+ 2 - 0
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/

+ 0 - 1
debian/libapt-pkg-doc.docs

@@ -1,3 +1,2 @@
 doc/libapt-pkg2_to_3.txt
 doc/style.txt
-#build/doc/doxygen/html

+ 0 - 1
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