[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 ca25ccf01f3c54a9e9ebc7abba021dccc41287f5
Author: David Paleino <dapal at debian.org>
Date:   Sun Jun 20 09:57:33 2010 +0200

    debian/control: added Replaces: cryptsetup (Closes: #586161)

diff --git a/debian/changelog b/debian/changelog
index d7a086c..036c35f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ bash-completion (1:1.2-2) UNRELEASED; urgency=low
   * debian/patches/:
     - 00-fix_586210.patch added, fixes a weird error while loading
       service(8) completions. Thanks to John Hedges (Closes: #586210)
+  * debian/control:
+    - added Replaces: cryptsetup (Closes: #586161)
 
- -- David Paleino <dapal at debian.org>  Thu, 17 Jun 2010 17:54:06 +0200
+ -- David Paleino <dapal at debian.org>  Fri, 18 Jun 2010 13:47:58 +0200
 
 bash-completion (1:1.2-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 3973eba..bb57821 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Conflicts: xen-tools (<= 4.1-1)
 Replaces:
  bash (<< 3.1dfsg-9)
  , xen-tools (<= 4.1-1)
+ , cryptsetup (<< 2:1.1.2-2)
 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