Avoid wedging the entire system if recoverable :/.

[apt.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 9537ecd939600b6b31094482add77bd42551ab46..62d913f0aafe29d2b2ab5913054fbc67c5e88f39 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,18 +8,18 @@ export DEB_BUILD_MAINT_OPTIONS := hardening=+all
 # do not fail as we are just experimenting with symbol files for now
 export DPKG_GENSYMBOLS_CHECK_LEVEL=0
 
+export CTEST_OUTPUT_ON_FAILURE=1
+
 %:
-       dh $@ --with systemd --parallel --buildsystem=cmake
+       dh $@
 
 override_dh_install-indep:
-       dh_movefiles
        dh_install --list-missing
 
-       find debian/libapt-pkg-doc/usr/share/doc/libapt-pkg-doc/html \( -name '*.md5' -o -name '*.map' \) -delete
-
 override_dh_install-arch:
-       dh_movefiles
-       dh_install --fail-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
 
@@ -29,8 +29,16 @@ override_dh_gencontrol:
 override_dh_installcron:
        dh_installcron --name=apt-compat
 
+override_dh_systemd_start:
+       # Do not restart "apt-daily.service" because this script runs
+       # unattended-upgrades. So if apt itself is upgraded as part of
+       # an unattended-upgrades run it would kill itself
+       dh_systemd_start apt-daily.timer
 
 override_dh_auto_configure-arch: flags=-DWITH_DOC=OFF
 override_dh_auto_configure-indep: flags=-DWITH_DOC=ON
 override_dh_auto_configure-arch override_dh_auto_configure-indep:
        dh_auto_configure -- $(flags)
+
+override_dh_auto_build:
+       dh_auto_build -- -O