[Pkg-cli-apps-commits] [SCM] keepass2 branch, master, updated. debian/2.18+dfsg-2-7-gb24722a

[Julian Taylor]

The following commit has been merged in the master branch:
commit b24722ac4f9c006bcc1d8a0a835fae2f487522ab
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Wed May 2 19:21:30 2012 +0200

    update short description and drop obsolete Replaces

diff --git a/debian/changelog b/debian/changelog
index 8b796b4..1dc05b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ keepass2 (2.19+dfsg-1) UNRELEASED; urgency=low
     - drop upstream applied fix-winforms-eventordering.patch
   * debian/copyright: update format url
   * bump to standard 3.9.3, no changes required
+  * update short description and drop obsolete Replaces
 
- -- Julian Taylor <jtaylor.debian at googlemail.com>  Wed, 02 May 2012 19:19:45 +0200
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Wed, 02 May 2012 19:21:17 +0200
 
 keepass2 (2.18+dfsg-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 5ad2a01..61a2a53 100644
--- a/debian/control
+++ b/debian/control
@@ -34,9 +34,7 @@ Architecture: all
 Section: doc
 Depends: ${cli:Depends}, ${misc:Depends}
 Suggests: xdotool
-Replaces: keepass2 (<< 2.15+dfsg-3)
-Breaks: keepass2 (<< 2.15+dfsg-3)
-Description: Password manager
+Description: Password manager - Documentation
  KeePass is a easy-to-use password manager for Windows, Linux, Mac OS X and
  mobile devices. You can store your passwords in highly-encrypted databases,
  which can only be unlocked with one master password and/or a key file.

-- 
keepass2