Merge remote-tracking branch 'mvo/feature/apt-ftparchive-srccache2' into debian/sid

[apt.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 196761444a6c8a9db9a1999e1bf58a80ab6f8314..f8b392986215519ac9e77504180d1df088de9776 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -189,8 +189,8 @@ apt: build-binary build-manpages debian/apt.install
        cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
        cp debian/apt.auto-removal.sh debian/$@/etc/kernel/postinst.d/apt-auto-removal
        chmod 755 debian/$@/etc/kernel/postinst.d/apt-auto-removal
-       # install bash completion
-       cp share/bash-completions/* debian/$@/usr/share/bash-completion/completions/
+       # install vendor specific apt confs
+       find -L vendor/current -name 'apt.conf-*' | while read conf; do cp "$${conf}" "debian/$@/etc/apt/apt.conf.d/$${conf#*-}"; done
 
        # make rosetta happy and remove pot files in po/ (but leave stuff
        # in po/domains/* untouched) and cp *.po into each domain dir