[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 b435f3e9e9a1467e78cf94a3bd5b1551de17c367
Author: David Paleino <dapal at debian.org>
Date:   Sun Apr 10 12:34:18 2011 +0200

    Use Breaks+Replaces xen-tools, because of conflicting files

diff --git a/debian/changelog b/debian/changelog
index 155af36..058d5e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ bash-completion (1:1.3-2) UNRELEASED; urgency=low
   * Remove old UCF-related postinst tasks
   * Remove old conffiles, using dpkg-maintscript-helper
   * Added debian/NEWS, to explain the changes with this revision
+  * Use Breaks+Replaces xen-tools, because of conflicting files
 
- -- David Paleino <dapal at debian.org>  Sun, 10 Apr 2011 08:27:38 +0200
+ -- David Paleino <dapal at debian.org>  Sun, 10 Apr 2011 12:34:02 +0200
 
 bash-completion (1:1.3-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 285c70e..780c630 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Architecture: all
 Depends:
  bash (>= 3.2)
  , ${misc:Depends}
-Conflicts: xen-tools (<= 4.1-1)
+Breaks: xen-tools (<= 4.1-1)
 Replaces:
  bash
  , xen-tools (<= 4.1-1)

-- 
debian-package