Package: bash
Version: 4.2-1
Severity: wishlist
Tags: patch
David Paleino wrote:
> On Thu, 10 Nov 2011 16:01:54 +0100, Simon Chopin wrote:
>> I think it would be better if the /etc file would be dropped, or
>> at least be changed into a symlink to the /usr/share. This way, the
>> point of break would be more evident.
>
> Ok, I'll use a symlink. I totally forgot to drop /etc/bash_completion. Sorry
> for the noise.
Thanks. This also affects users' dotfiles, so I fear the symlink might be
needed for a while.
> Bash maintainers: the new bash-completion location is
> at /usr/share/bash-completion/bash_completion . Please update the files of
> your
> package (bash.bashrc, but there may be others) to reflect the new location.
> TIA!
How about this patch (untested)?
debian/README.bash_completion | 6 ++++--
debian/changelog | 9 +++++++++
debian/control | 2 +-
debian/etc.bash.bashrc | 4 ++--
debian/skel.bashrc | 4 ++--
5 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/debian/README.bash_completion b/debian/README.bash_completion
index e0a8e758..4580ebfb 100644
--- a/debian/README.bash_completion
+++ b/debian/README.bash_completion
@@ -12,6 +12,8 @@
]
To enable programmable completion for bash on Debian, uncomment the
-bash_completion lines in /etc/bash.bashrc to source /etc/bash_completion.
-/etc/bash_completion sources ~/.bash_completion, if it exists.
+bash_completion lines in /etc/bash.bashrc to source
+/usr/share/bash-completion/bash_completion.
+/usr/share/bash-completion/bash_completion sources ~/.bash_completion, if
+it exists.
diff --git a/debian/changelog b/debian/changelog
index 8ab1c42a..8048e75e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+bash (4.2-1.1) local; urgency=low
+
+ * Update README.bash_completion, /etc/bash.bashrc, /etc/skel/.bashrc to
+ reflect new location of the bash_completion script.
+ * Breaks: bash-completion (<< 1:1.3-2).
+ * No longer Conflicts: but still Replaces: bash-completion (<< 20060301-0).
+
+ -- Jonathan Nieder <jrnie...@gmail.com> Mon, 09 Jan 2012 03:48:34 -0600
+
bash (4.2-1) unstable; urgency=low
[ Matthias Klose ]
diff --git a/debian/control b/debian/control
index 3e035069..cab837e3 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Architecture: any
Pre-Depends: dash (>= 0.5.5.1-2.2), ${shlibs:Pre-Depends}, ${misc:Depends}
Depends: base-files (>= 2.1.12), debianutils (>= 2.15)
Recommends: bash-completion (>= 20060301-0)
-Conflicts: bash-completion (<< 20060301-0)
+Breaks: bash-completion (<< 1:1.3-2)
Replaces: bash-doc (<= 2.05-1), bash-completion (<< 20060301-0)
Suggests: bash-doc
Essential: yes
diff --git a/debian/etc.bash.bashrc b/debian/etc.bash.bashrc
index e55db2ab..c0711516 100644
--- a/debian/etc.bash.bashrc
+++ b/debian/etc.bash.bashrc
@@ -29,8 +29,8 @@ PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
#esac
# enable bash completion in interactive shells
-#if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
-# . /etc/bash_completion
+#if [ -f /usr/share/bash-completion/bash_completion ] && ! shopt -oq posix;
then
+# . /usr/share/bash-completion/bash_completion
#fi
# if the command-not-found package is installed, use it
diff --git a/debian/skel.bashrc b/debian/skel.bashrc
index 10ec4361..38ec483f 100644
--- a/debian/skel.bashrc
+++ b/debian/skel.bashrc
@@ -94,6 +94,6 @@ fi
# enable programmable completion features (you don't need to enable
# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
# sources /etc/bash.bashrc).
-if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
- . /etc/bash_completion
+if [ -f /usr/share/bash-completion/bash_completion ] && ! shopt -oq posix; then
+ . /usr/share/bash-completion/bash_completion
fi
--
1.7.8.2
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
