Merge from sarge branch.

[software/mutt-debian.git] / debian / patches / misc / define-pgp_getkeys_command.diff

diff --git a/debian/patches/misc/define-pgp_getkeys_command.diff b/debian/patches/misc/define-pgp_getkeys_command.diff
index 9964e48a33ffafbbad3ab1c69f476caffe79936d..3dbad753d3d8a9ec50c576d9731e3b3f4e5bd68b 100644 (file)
--- a/debian/patches/misc/define-pgp_getkeys_command.diff
+++ b/debian/patches/misc/define-pgp_getkeys_command.diff
@@ -1,11 +1,13 @@
---- mutt-1.5.11.orig/contrib/gpg.rc
-+++ mutt-1.5.11/contrib/gpg.rc
-@@ -72,6 +72,8 @@
+Index: contrib/gpg.rc
+===================================================================
+--- contrib/gpg.rc.orig        2007-03-01 23:14:09.076973224 +0100
++++ contrib/gpg.rc     2007-03-01 23:32:04.172533856 +0100
+@@ -72,6 +72,8 @@ set pgp_list_secring_command="/usr/bin/g

  
  # fetch keys
  # set pgp_getkeys_command="pkspxycwrap %r"
 +# This will work when #172960 will be fixed upstream
  
  # fetch keys
  # set pgp_getkeys_command="pkspxycwrap %r"
 +# This will work when #172960 will be fixed upstream

-+# set pgp_getkeys_command="/usr/bin/gpg --recv-keys %r"
++# set pgp_getkeys_command="gpg --recv-keys %r"

  
  # pattern for good signature - may need to be adapted to locale!
  
  
  # pattern for good signature - may need to be adapted to locale!