2003-05-27 Marcus Brinkmann <[email protected]>

	* gpg/Makefile.am (TESTS): Order t-keylist and t-keylist-sig after
	t-import.
	* gpg/t-edit.c (edit_fnc): Work around gpg 1.2.2 bug by resetting
	primary uid after setting expiration date.
	* gpg/t-keylist.c: Change order of user IDs.
	* gpg/t-keylist-sig.c: Likewise.
	* gpg/t-import.c: Add support for gpg in CVS.

1 files changed, 6 insertions, 6 deletions

diff --git a/tests/gpg/t-keylist-sig.c b/tests/gpg/t-keylist-sig.c
index 46260bfb..63251ad7 100644
--- a/tests/gpg/t-keylist-sig.c
+++ b/tests/gpg/t-keylist-sig.c
@@ -62,15 +62,15 @@ struct
 keys[] =
   {
     { "A0FF4590BB6122EDEF6E3C542D727CC768697734", "6AE6D7EE46A871F8",
-      { { "Alpha Test", "demo key", "[email protected]",
+      { { "Alfa Test", "demo key", "[email protected]",
           { GPGME_PK_DSA, "2D727CC768697734",
-	    "Alpha Test", "demo key", "[email protected]", 19, 1 } },
-	{ "Alice", "demo key", NULL,
+	    "Alfa Test", "demo key", "[email protected]", 19, 1 } },
+	{ "Alpha Test", "demo key", "[email protected]",
           { GPGME_PK_DSA, "2D727CC768697734",
-	    "Alpha Test", "demo key", "[email protected]", 19, 1 } },
-	{ "Alfa Test", "demo key", "[email protected]",
+	    "Alfa Test", "demo key", "[email protected]", 19, 1 } },
+	{ "Alice", "demo key", NULL,
           { GPGME_PK_DSA, "2D727CC768697734",
-	    "Alpha Test", "demo key", "[email protected]", 19, 1 } } } },
+	    "Alfa Test", "demo key", "[email protected]", 19, 1 } } } },
     { NULL }
   };