Merge EDSP 0.5 w/ multi-arch support for external solvers

[apt.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 300c0f756085f41ec5984b3316a7e1e473bc38a5..f8b392986215519ac9e77504180d1df088de9776 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -56,9 +56,6 @@ endif
 # APT Programs in apt-utils
 APT_UTILS=ftparchive sortpkgs extracttemplates
 
-# get distro
-APT_VENDOR_CONF := $(shell lsb_release -i -s)
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -192,12 +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 distro specific apt conf
-       if [ -e debian/apt.conf.${APT_VENDOR_CONF} ]; then \
-               cp debian/apt.conf.${APT_VENDOR_CONF} debian/$@/etc/apt/apt.conf.d/01-vendor-${APT_VENDOR_CONF}; \
-       fi
+       # 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