r14587 - 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: Fri Feb 15 22:33:41 2008
New Revision: 14587

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14587
Log:
* Fix capitalization of GNOME, and a repetition of the short
* 03_old_gnupg.patch: new patch, reverts upstream commit r1781. It is
  incompatible with the age requirements of the GnuPG version in
  Debian. Fixes an infinite loop. Closes: #465481.
* Conflict against gnupg >= 1.4.7 to handle gracefully the time when
  gnupg will be updated.

Added:
    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=14587&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/changelog (original)
+++ desktop/unstable/seahorse/debian/changelog Fri Feb 15 22:33:41 2008
@@ -1,9 +1,14 @@
-seahorse (2.20.3-2) UNRELEASED; urgency=low
-
-  * Fix capitalization of GNOME, and a repetition of the short 
+seahorse (2.20.3-2) unstable; urgency=low
+
+  * Fix capitalization of GNOME, and a repetition of the short
     description in the long one.
-
- -- Josselin Mouette <joss at debian.org>  Wed,  9 Jan 2008 10:56:08 +0100
+  * 03_old_gnupg.patch: new patch, reverts upstream commit r1781. It is
+    incompatible with the age requirements of the GnuPG version in
+    Debian. Fixes an infinite loop. Closes: #465481.
+  * Conflict against gnupg >= 1.4.7 to handle gracefully the time when
+    gnupg will be updated.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 15 Feb 2008 23:35:04 +0100
 
 seahorse (2.20.3-1) unstable; urgency=low
 

Modified: desktop/unstable/seahorse/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control?rev=14587&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control (original)
+++ desktop/unstable/seahorse/debian/control Fri Feb 15 22:33:41 2008
@@ -37,6 +37,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 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=14587&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control.in (original)
+++ desktop/unstable/seahorse/debian/control.in Fri Feb 15 22:33:41 2008
@@ -37,6 +37,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 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 

Added: desktop/unstable/seahorse/debian/patches/03_old_gnupg.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/03_old_gnupg.patch?rev=14587&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/patches/03_old_gnupg.patch (added)
+++ desktop/unstable/seahorse/debian/patches/03_old_gnupg.patch Fri Feb 15 22:33:41 2008
@@ -1,0 +1,15 @@
+Debian bug#465481, reverts upstream commit r1781.
+Remove this patch (and the conflict) when gnupg gets updated to 1.4.7.
+Index: seahorse-2.20.3/libseahorse/seahorse-pgp-key-op.h
+===================================================================
+--- seahorse-2.20.3.orig/libseahorse/seahorse-pgp-key-op.h	2008-02-15 23:25:04.196035746 +0100
++++ seahorse-2.20.3/libseahorse/seahorse-pgp-key-op.h	2008-02-15 23:25:22.173060198 +0100
+@@ -45,7 +45,7 @@ typedef enum {
+ 	/* ElGamal subkey, encrypt only. See #ELGAMAL_MIN and #LENGTH_MAX.
+ 	 * Only used in seahorse_ops_key_add_subkey().
+ 	 */
+-	ELGAMAL = 4,
++	ELGAMAL = 3,
+ 	/* RSA key, sign only. Can be a subkey or a primary key.
+ 	 * See #RSA_MIN and #RSA_MAX.
+ 	 */

Modified: desktop/unstable/seahorse/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/series?rev=14587&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/series (original)
+++ desktop/unstable/seahorse/debian/patches/series Fri Feb 15 22:33:41 2008
@@ -1,4 +1,5 @@
 01_epiphany-path.patch
 02_mlock.patch
+03_old_gnupg.patch
 08_force_ssh.patch
 10_relibtoolize.patch