[Bash-completion-commits] [SCM] debian-package branch, master, updated. debian/1.3-1-32-g653f34e

[David Paleino]

The following commit has been merged in the master branch:
commit 576fc2f4943dd60b9a804e1f7942e876987c570c
Author: David Paleino <dapal at debian.org>
Date:   Sun Apr 10 12:00:19 2011 +0200

    Use /var/lib/bash-completion instead of /etc/bash_completion.d/triggered

diff --git a/debian/dirs b/debian/dirs
index c57d6fb..bbe08bd 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,5 +1,6 @@
-etc/bash_completion.d/triggered/
+etc/bash_completion.d
 usr/bin
 usr/share/doc/bash
 usr/share/doc/bash-completion
 usr/share/perl5/Debian/Debhelper/Sequence/
+var/lib/bash-completion
diff --git a/debian/extra/update-bash-completion b/debian/extra/update-bash-completion
index e6bb946..4718f52 100755
--- a/debian/extra/update-bash-completion
+++ b/debian/extra/update-bash-completion
@@ -2,7 +2,7 @@
 
 COMPDICT=/usr/share/bash-completion/compdict
 COMPDIR=/usr/share/bash-completion
-RUNCOMPDIR=/etc/bash_completion.d/triggered
+RUNCOMPDIR=/var/lib/bash-completion
 
 if [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
     echo "Usage: update-bash-completion [clean]"
diff --git a/debian/patches/00-change_completions_layout.patch b/debian/patches/00-change_completions_layout.patch
index d1d0137..e528c83 100644
--- a/debian/patches/00-change_completions_layout.patch
+++ b/debian/patches/00-change_completions_layout.patch
@@ -387,7 +387,7 @@
  [ -n "$BASH_COMPLETION" ] || BASH_COMPLETION=/etc/bash_completion
  [ -n "$BASH_COMPLETION_DIR" ] || BASH_COMPLETION_DIR=/etc/bash_completion.d
 -[ -n "$BASH_COMPLETION_COMPAT_DIR" ] || BASH_COMPLETION_COMPAT_DIR=/etc/bash_completion.d
-+[ -n "$BASH_COMPLETION_COMPAT_DIR" ] || BASH_COMPLETION_COMPAT_DIR=/etc/bash_completion.d/triggered
++[ -n "$BASH_COMPLETION_COMPAT_DIR" ] || BASH_COMPLETION_COMPAT_DIR=/var/lib/bash-completion/
  readonly BASH_COMPLETION BASH_COMPLETION_DIR BASH_COMPLETION_COMPAT_DIR
  
  # Set a couple of useful vars

-- 
debian-package