allow vendors to install configuration files

Vendors like ubuntu need to change some options, so giving them
a way to do this less painfully avoids reducing differences.

3 files changed, 8 insertions, 7 deletions

diff --git a/debian/rules b/debian/rules
index 300c0f756..fc0e9e8f6 100755
--- 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
 
@@ -194,10 +191,8 @@ apt: build-binary build-manpages debian/apt.install
 	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
diff --git a/vendor/README b/vendor/README
index 19cda6236..c2fabbd4c 100644
--- a/vendor/README
+++ b/vendor/README
@@ -58,3 +58,9 @@ You can use some placeholders in this file, namely:
 with the value you would expect based on the name.
 
 The placeholder &current-codename; is yours and can be set in apt-vendor.ent
+
+
+== apt.conf-*
+
+Files in your vendor directory following this naming scheme will be picked up
+by the debian/rules file and installed in /etc/apt/apt.conf.d/ directory.
diff --git a/debian/apt.conf.Ubuntu b/vendor/ubuntu/apt.conf-01-vendor-ubuntu
index c4092ff44..c4092ff44 100644
--- a/debian/apt.conf.Ubuntu
+++ b/vendor/ubuntu/apt.conf-01-vendor-ubuntu