Merge branch 'debian/sid' into ubuntu/master

Conflicts:
	po/vi.po

3 files changed, 8 insertions, 0 deletions

diff --git a/debian/apt.dirs b/debian/apt.dirs
index ecbcdbc0a..1e8b057eb 100644
--- a/debian/apt.dirs
+++ b/debian/apt.dirs
@@ -16,3 +16,4 @@ var/lib/apt/periodic
 var/log/apt
 usr/share/apt
 usr/share/bug/apt
+usr/share/bash-completion/completions/
diff --git a/debian/apt.maintscript b/debian/apt.maintscript
new file mode 100644
index 000000000..939769355
--- /dev/null
+++ b/debian/apt.maintscript
@@ -0,0 +1,3 @@
+rm_conffile /etc/apt/apt.conf.d/20changelog 1.0.3 -- "@"
+
+
diff --git a/debian/rules b/debian/rules
index 338890445..c013c3a55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -191,6 +191,10 @@ apt: build-binary build-manpages debian/apt.install
 	cp share/ubuntu-archive.gpg debian/$@/usr/share/$@
 	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