From 89e4e056bd8cb0af9b515fec994cb6706bfe7e1c Mon Sep 17 00:00:00 2001
From: kink-guest <kink-guest@b513b33f-fedd-0310-b452-c3deb5f4c849>
Date: Sun, 9 Jul 2006 15:39:16 +0000
Subject: [PATCH] * gpg-mailkeys: use right content-type for attached key,  
 thanks Wesley Landaker (Closes: #370566).

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@288 b513b33f-fedd-0310-b452-c3deb5f4c849
---
 debian/changelog            | 2 ++
 gpg-mailkeys/gpg-mailkeys   | 6 +++---
 gpg-mailkeys/gpg-mailkeys.1 | 5 +++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d46e9a0..51039b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 signing-party (0.4.6-3) unstable; urgency=low
 
   * Update my maintainer address.
+  * gpg-mailkeys: use right content-type for attached key,
+    thanks Wesley Landaker (Closes: #370566).
 
  -- Thijs Kinkhorst <thijs@debian.org>  Tue,  4 Jul 2006 15:33:53 +0200
 
diff --git a/gpg-mailkeys/gpg-mailkeys b/gpg-mailkeys/gpg-mailkeys
index ec45dfa..d9ca259 100755
--- a/gpg-mailkeys/gpg-mailkeys
+++ b/gpg-mailkeys/gpg-mailkeys
@@ -59,7 +59,7 @@ Subject: $SUBJECT
 User-Agent: gpg-mailkeys/$VERSION
 MIME-Version: 1.0
 Content-Type: multipart/mixed; micalg=pgp-sha1;
-    protocol="application/pgp-signature"; boundary="$BOUNDARY"
+    boundary="$BOUNDARY"
 Content-Disposition: inline
 
 
@@ -82,8 +82,8 @@ fi
 cat << EOM >> $TEMPFILE
 
 --$BOUNDARY
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: attachment; filename="$1.sig"
+Content-Type: application/pgp-keys
+Content-Disposition: attachment; filename="$1.asc"
 
 `gpg --armor --export $1`
 
diff --git a/gpg-mailkeys/gpg-mailkeys.1 b/gpg-mailkeys/gpg-mailkeys.1
index eed2a91..a1a6767 100644
--- a/gpg-mailkeys/gpg-mailkeys.1
+++ b/gpg-mailkeys/gpg-mailkeys.1
@@ -9,6 +9,11 @@ gpg\-mailkeys \- sends emails containing keys to their owners
 sends the owners of the keys listed on the command line a mail each,
 containing their public key. After signing, you can use this tool to send
 everyone the new signatures they just got.
+
+If you're interested in encrypting the signature before it's sent, in order
+to verify that the associated address actually belongs to the key owner,
+you should check out
+.B caff
 .SH OPTIONS
 None
 .SH ENVIRONMENT
-- 
2.30.2