[Bash-completion-commits] [SCM] debian-package branch, master, updated. debian/1.1-3-2-ge1d03ce

[David Paleino]

The following commit has been merged in the master branch:
commit e1d03cecbb1be1bc2f6c2d20cfe977c99fea02f4
Author: David Paleino <dapal at debian.org>
Date:   Sun Mar 21 22:31:24 2010 +0100

    debian/control: add Conflicts/Replaces on xen-tools (<= 4.1-1) (Closes: #550590)

diff --git a/debian/changelog b/debian/changelog
index 6567449..eec089e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ bash-completion (1:1.1-4) UNRELEASED; urgency=low
   * debian/patches/04-fix_557436.patch added, added missing
     completions for -?, --help, --license, --usage, --version
     and (-p) --to-stdout to contrib/cpio (Closes: #557436)
+  * debian/control:
+    - add Conflicts/Replaces on xen-tools (<= 4.1-1) (Closes: #550590)
 
- -- David Paleino <dapal at debian.org>  Sun, 22 Nov 2009 08:23:53 +0100
+ -- David Paleino <dapal at debian.org>  Sun, 21 Mar 2010 22:30:46 +0100
 
 bash-completion (1:1.1-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a473c1a..4e015d9 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,9 @@ Package: bash-completion
 Architecture: all
 Depends: bash (>= 3.1dfsg-9),
  ${misc:Depends}
+Conflicts: xen-tools (<= 4.1-1)
 Replaces: bash (<< 3.1dfsg-9)
+ , xen-tools (<= 4.1-1)
 Description: programmable completion for the bash shell
  bash completion extends bash's standard completion behavior to achieve
  complex command lines with just a few keystrokes.  This project was

-- 
debian-package