r16149 - in /desktop/unstable/seahorse/debian: changelog control control.in patches/03_old_gnupg.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Jun  3 13:29:16 2008
New Revision: 16149

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16149
Log:
* 03_old_gnupg.patch: removed, we have gnupg 1.4.9 now.
* Now depend on gnupg >= 1.4.7 instead of the conflict.

Removed:
    desktop/unstable/seahorse/debian/patches/03_old_gnupg.patch
Modified:
    desktop/unstable/seahorse/debian/changelog
    desktop/unstable/seahorse/debian/control
    desktop/unstable/seahorse/debian/control.in
    desktop/unstable/seahorse/debian/patches/series

Modified: desktop/unstable/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/changelog?rev=16149&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/changelog (original)
+++ desktop/unstable/seahorse/debian/changelog Tue Jun  3 13:29:16 2008
@@ -1,3 +1,10 @@
+seahorse (2.22.2-2) UNRELEASED; urgency=low
+
+  * 03_old_gnupg.patch: removed, we have gnupg 1.4.9 now.
+  * Now depend on gnupg >= 1.4.7 instead of the conflict.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 03 Jun 2008 15:24:59 +0200
+
 seahorse (2.22.2-1) unstable; urgency=low
 
   * New upstream bugfix release:

Modified: desktop/unstable/seahorse/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control?rev=16149&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control (original)
+++ desktop/unstable/seahorse/debian/control Tue Jun  3 13:29:16 2008
@@ -36,9 +36,9 @@
 Package: seahorse
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends}
+         ${misc:Depends},
+         gnupg (>= 1.4.7)
 Recommends: openssh-client
-Conflicts: gnupg (>= 1.4.7)
 Description: GNOME front end for GnuPG
  Seahorse is a front end for GnuPG - the Gnu Privacy Guard program - 
  that integrates to the GNOME desktop. It is a tool for secure 

Modified: desktop/unstable/seahorse/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control.in?rev=16149&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control.in (original)
+++ desktop/unstable/seahorse/debian/control.in Tue Jun  3 13:29:16 2008
@@ -36,9 +36,9 @@
 Package: seahorse
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends}
+         ${misc:Depends},
+         gnupg (>= 1.4.7)
 Recommends: openssh-client
-Conflicts: gnupg (>= 1.4.7)
 Description: GNOME front end for GnuPG
  Seahorse is a front end for GnuPG - the Gnu Privacy Guard program - 
  that integrates to the GNOME desktop. It is a tool for secure 

Modified: desktop/unstable/seahorse/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/series?rev=16149&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/series (original)
+++ desktop/unstable/seahorse/debian/patches/series Tue Jun  3 13:29:16 2008
@@ -1,5 +1,4 @@
 01_sharedlib.patch
-03_old_gnupg.patch
 04_ldap_deprecated.patch
 05_focus_windows.patch
 06_tray_hide_window.patch