summaryrefslogtreecommitdiffstats
path: root/keyserver
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2007-05-04 11:23:51 +0200
committerWerner Koch <wk@gnupg.org>2007-05-04 11:23:51 +0200
commit2ec906db3a1109e786b7813ec1ab0414f96c104a (patch)
tree81fabf7be0666e4a1cdc2969c07e0503f41bda66 /keyserver
parentUTF-8 Fixes (diff)
downloadgnupg2-2ec906db3a1109e786b7813ec1ab0414f96c104a.tar.xz
gnupg2-2ec906db3a1109e786b7813ec1ab0414f96c104a.zip
Fixed installation of gpg2keys_mailto
Diffstat (limited to 'keyserver')
-rw-r--r--keyserver/ChangeLog8
-rw-r--r--keyserver/Makefile.am2
-rwxr-xr-xkeyserver/gpg2keys_mailto.in (renamed from keyserver/gpgkeys_mailto.in)4
-rwxr-xr-xkeyserver/gpg2keys_test.in (renamed from keyserver/gpgkeys_test.in)4
4 files changed, 13 insertions, 5 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 3e009430a..2120ee95c 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-04 Werner Koch <wk@g10code.com>
+
+ * gpgkeys_test.in: Rename to ..
+ * gpg2keys_test.in: .. this.
+ * gpgkeys_mailto.in: Rename to ..
+ * gpg2keys_mailto.in: .. this
+ * Makefile.am: Likewise
+
2007-03-13 David Shaw <dshaw@jabberwocky.com>
From STABLE-BRANCH-1-4
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am
index 2e9add011..f6a287030 100644
--- a/keyserver/Makefile.am
+++ b/keyserver/Makefile.am
@@ -34,7 +34,7 @@ include $(top_srcdir)/am/cmacros.am
libexec_PROGRAMS = $(GPGKEYS_LDAP) $(GPGKEYS_HKP) $(GPGKEYS_FINGER) \
$(GPGKEYS_CURL)
libexec_SCRIPTS = $(GPGKEYS_MAILTO)
-noinst_SCRIPTS = gpgkeys_test
+noinst_SCRIPTS = gpg2keys_test
common_libs = ../gl/libgnu.a ../common/libcommon.a ../jnlib/libjnlib.a
other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
diff --git a/keyserver/gpgkeys_mailto.in b/keyserver/gpg2keys_mailto.in
index e37f5c0bc..4d5f62711 100755
--- a/keyserver/gpgkeys_mailto.in
+++ b/keyserver/gpg2keys_mailto.in
@@ -1,6 +1,6 @@
#!@PERL@ -w
-# gpgkeys_mailto - talk to a email keyserver
+# gpg2keys_mailto - talk to a email keyserver
# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
#
# This file is part of GnuPG.
@@ -27,7 +27,7 @@ $sendmail="@SENDMAIL@ -t";
sub VERSION_MESSAGE ()
{
- print STDOUT "gpgkeys_mailto (GnuPG) @VERSION@\n";
+ print STDOUT "gpg2keys_mailto (GnuPG) @VERSION@\n";
}
sub HELP_MESSAGE ()
diff --git a/keyserver/gpgkeys_test.in b/keyserver/gpg2keys_test.in
index 97748cd3f..c335c65a2 100755
--- a/keyserver/gpgkeys_test.in
+++ b/keyserver/gpg2keys_test.in
@@ -1,6 +1,6 @@
#!@PERL@
-# gpgkeys_test - keyserver code tester
+# gpg2keys_test - keyserver code tester
# Copyright (C) 2001 Free Software Foundation, Inc.
#
# This file is part of GnuPG.
@@ -26,7 +26,7 @@ $|=1;
sub VERSION_MESSAGE ()
{
- print STDOUT "gpgkeys_test (GnuPG) @VERSION@\n";
+ print STDOUT "gpg2keys_test (GnuPG) @VERSION@\n";
}
sub HELP_MESSAGE ()