[Bash-completion-commits] [SCM] debian-package branch, master, updated. debian/1.2-1-7-gb11e3e4

[David Paleino]

The following commit has been merged in the master branch:
commit 3746a26306355f95741f79e02e1acfc0079cd26e
Author: David Paleino <dapal at debian.org>
Date:   Tue Nov 16 09:06:09 2010 +0100

    Provide a saner upgrade path from older bash packages, which shipped /etc/bash_completion (Closes: #564254)

diff --git a/debian/changelog b/debian/changelog
index 765ca52..685ec2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+bash-completion (1:1.2-3) UNRELEASED; urgency=low
+
+  * Provide a saner upgrade path from older bash packages, which
+    shipped /etc/bash_completion (Closes: #564254)
+
+ -- David Paleino <dapal at debian.org>  Tue, 16 Nov 2010 09:05:18 +0100
+
 bash-completion (1:1.2-2) unstable; urgency=low
 
   * debian/patches/:
diff --git a/debian/control b/debian/control
index bb57821..595ae79 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Depends:
  , ${misc:Depends}
 Conflicts: xen-tools (<= 4.1-1)
 Replaces:
- bash (<< 3.1dfsg-9)
+ bash
  , xen-tools (<= 4.1-1)
  , cryptsetup (<< 2:1.1.2-2)
 Description: programmable completion for the bash shell

-- 
debian-package