[maemo-commits] [maemo-commits] r14905 - projects/haf/trunk/gnupg/debian

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-12-07 01:02:18 +0200 (Fri, 07 Dec 2007)
New Revision: 14905

Modified:
   projects/haf/trunk/gnupg/debian/control
Log:
gnupg (1.4.6-2maemo1) unstable; urgency=low

  * Conflict/replace with the old osso-gnupg.

 -- Marius Vollmer <mvo at zagadka.de>  Fri, 07 Dec 2007 00:55:15 +0200


Modified: projects/haf/trunk/gnupg/debian/control
===================================================================
--- projects/haf/trunk/gnupg/debian/control	2007-12-06 23:01:56 UTC (rev 14904)
+++ projects/haf/trunk/gnupg/debian/control	2007-12-06 23:02:18 UTC (rev 14905)
@@ -9,8 +9,8 @@
 Architecture: any
 Depends: ${shlibs:Depends}, gpgv
 Suggests: gnupg-doc, xloadimage
-Conflicts: gpg-rsa, gpg-rsaref, suidmanager (<< 0.50), gpg-idea (<= 2.2)
-Replaces: gpg-rsa, gpg-rsaref
+Conflicts: gpg-rsa, gpg-rsaref, suidmanager (<< 0.50), gpg-idea (<= 2.2), osso-gnupg (<< 1.4.6)
+Replaces: gpg-rsa, gpg-rsaref, osso-gnupg (<< 1.4.6)
 Provides: gpg-rsa, gpg-rsaref
 Description: GNU privacy guard - a free PGP replacement
  GnuPG is GNU's tool for secure communication and data storage.