[Pkg-gnupg-commit] r48 - in /gnupg/trunk/debian: changelog control

[pusling-guest at users.alioth.debian.org]

Author: pusling-guest
Date: Tue Jun  3 22:45:52 2008
New Revision: 48

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=48
Log:
Add a seahorse conflicts as the seahorse maintainer like.

Modified:
    gnupg/trunk/debian/changelog
    gnupg/trunk/debian/control

Modified: gnupg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/changelog?rev=48&op=diff
==============================================================================
--- gnupg/trunk/debian/changelog (original)
+++ gnupg/trunk/debian/changelog Tue Jun  3 22:45:52 2008
@@ -3,6 +3,7 @@
   * Switch maintainer to maillist. This package is now official team
     maintained
   * Really enable patches added earlier. (Really Closes: #394037, #298699)
+  * Add a seahorse conflicts as the seahorse maintainer like.
 
  -- Sune Vuorela <debian at pusling.com>  Wed, 04 Jun 2008 00:41:11 +0200
 

Modified: gnupg/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/control?rev=48&op=diff
==============================================================================
--- gnupg/trunk/debian/control (original)
+++ gnupg/trunk/debian/control Tue Jun  3 22:45:52 2008
@@ -12,7 +12,7 @@
 Depends: ${shlibs:Depends}, gpgv
 Recommends: ${shlibs:Recommends}
 Suggests: gnupg-doc, xloadimage | imagemagick | eog, libpcsclite1
-Conflicts: gpg-rsa, gpg-rsaref, suidmanager (<< 0.50), gpg-idea (<= 2.2)
+Conflicts: gpg-rsa, gpg-rsaref, suidmanager (<< 0.50), gpg-idea (<= 2.2), seahorse (<< 2.22.2-2)
 Replaces: gpg-rsa, gpg-rsaref
 Provides: gpg-rsa, gpg-rsaref
 Description: GNU privacy guard - a free PGP replacement