[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-75-g14cfd45
by Werner Koch
cvs at cvs.gnupg.org
Tue May 8 16:35:53 CEST 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via 14cfd45d38db69f90242f8e10967262f4879753d (commit)
via 59b77f9ea7dfa4d5c74573d2186c9a3e129ab3bf (commit)
via d800fa5ce6102e069305f8e1a5d55d18ac3a1993 (commit)
from 0f02fba19df16c82ca1ad44a8cb09f952d755598 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 14cfd45d38db69f90242f8e10967262f4879753d
Author: Werner Koch <wk at gnupg.org>
Date: Tue May 8 14:33:34 2012 +0200
Always require libksba.
--
The extra test for libksba and possible trouble building GnuPG without
ksba is not anymore worth the trouble.
diff --git a/configure.ac b/configure.ac
index 6aadaa2..324f792 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
# configure.ac - for GnuPG 2.1
# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-# 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
#
# This file is part of GnuPG.
#
@@ -1506,11 +1506,6 @@ if test "$have_adns" = "yes"; then
fi
-if test $have_ksba = no; then
- build_gpgsm=no
- build_scdaemon=no
-fi
-
build_scdaemon_extra=""
if test "$build_scdaemon" = "yes"; then
if test $have_libusb = no; then
@@ -1592,18 +1587,9 @@ if test "$have_libgcrypt" = "no"; then
***
*** You need libgcrypt to build this program.
** This library is for example available at
-*** ftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/
-*** (at least version $NEED_LIBGCRYPT_VERSION using API $NEED_LIBGCRYPT_API is required.)
+*** ftp://ftp.gnupg.org/gcrypt/libgcrypt/
+*** (at least version $NEED_LIBGCRYPT_VERSION (API $NEED_LIBGCRYPT_API) is required.)
***]])
-dnl elif test "$gnupg_cv_gcry_kdf_derive" = no; then
-dnl die=yes
-dnl AC_MSG_NOTICE([[
-dnl ***
-dnl *** Libgcrypt 1.5.0 has not yet been released and thus the API
-dnl *** is a bit in a flux. Your version misses the function
-dnl *** gcry_kdf_derive
-dnl *** You need to install a newer Libgcrypt version.
-dnl #***]])
fi
if test "$have_libassuan" = "no"; then
die=yes
@@ -1616,6 +1602,7 @@ if test "$have_libassuan" = "no"; then
***]])
fi
if test "$have_ksba" = "no"; then
+ die=yes
AC_MSG_NOTICE([[
***
*** You need libksba to build this program.
@@ -1643,16 +1630,17 @@ if test "$gnupg_have_ldap" = "no"; then
fi
fi
if test "$have_npth" = "no"; then
+ die=yes
AC_MSG_NOTICE([[
***
*** It is now required to build with support for the
-*** New Portable Threads Library (NPth). Please install this
+*** New Portable Threads Library (nPth). Please install this
*** library first. The library is for example available at
*** ftp://ftp.gnupg.org/gcrypt/npth/
+*** (at least version $NEED_NPTH_VERSION (API $NEED_NPTH_API) is requi
*** On a Debian GNU/Linux system you can install it using
*** apt-get install libnpth-dev
***]])
- die=yes
fi
if test "$die" = "yes"; then
commit 59b77f9ea7dfa4d5c74573d2186c9a3e129ab3bf
Author: Werner Koch <wk at gnupg.org>
Date: Tue May 8 15:18:26 2012 +0200
po: Update de.po.
* po/de.po: Update.
diff --git a/po/de.po b/po/de.po
index 8b98258..82d29af 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-2.1.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2011-12-20 15:52+0100\n"
+"PO-Revision-Date: 2012-05-08 15:17+0200\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"MIME-Version: 1.0\n"
@@ -401,6 +401,10 @@ msgid "reading options from `%s'\n"
msgstr "Optionen werden aus '%s' gelesen\n"
#, c-format
+msgid "NOTE: `%s' is not considered an option\n"
+msgstr "Hinweis: `%s' wird nicht als Option betrachtet\n"
+
+#, c-format
msgid "error creating `%s': %s\n"
msgstr "Fehler beim Erstellen von `%s': %s\n"
@@ -470,8 +474,8 @@ msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "SSH-Handhabungsroutine 0x%lx für fd %d beendet\n"
#, c-format
-msgid "pth_select failed: %s - waiting 1s\n"
-msgstr "pth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
+msgid "npth_pselect failed: %s - waiting 1s\n"
+msgstr "npth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
#, c-format
msgid "%s %s stopped\n"
@@ -7262,12 +7266,8 @@ msgid "error reading log from ldap wrapper %d: %s\n"
msgstr "Fehler beim Lesen des Logs vom LDAP Wrapper %d: %s\n"
#, c-format
-msgid "pth_event failed: %s\n"
-msgstr "pth_event() fehlgeschlagen: %s\n"
-
-#, c-format
-msgid "pth_wait failed: %s\n"
-msgstr "pth_wait() fehlgeschlagen: %s\n"
+msgid "npth_select failed: %s - waiting 1s\n"
+msgstr "npth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
#, c-format
msgid "ldap wrapper %d ready"
@@ -7931,6 +7931,12 @@ msgstr ""
"Syntax: gpg-check-pattern [optionen] Musterdatei\n"
"Die von stdin gelesene Passphrase gegen die Musterdatei prüfen\n"
+#~ msgid "pth_event failed: %s\n"
+#~ msgstr "pth_event() fehlgeschlagen: %s\n"
+
+#~ msgid "pth_wait failed: %s\n"
+#~ msgstr "pth_wait() fehlgeschlagen: %s\n"
+
#, fuzzy
#~ msgid "||Please enter the Reset Code for the card and New PIN"
#~ msgstr "Bitte geben Sie den Rückstellcode für diese Karte ein"
commit d800fa5ce6102e069305f8e1a5d55d18ac3a1993
Author: Werner Koch <wk at gnupg.org>
Date: Tue May 8 15:14:58 2012 +0200
common: Remove generated files only during maintainer-clean.
* common/Makefile.am (CLEANFILES): Rename to MAINTAINERCLEANFILES.
--
In general this is not required because automake does this for files
in BUILT_SOURCES anyway. However, having them in CLEANFILES is wrong.
This is bug#1398.
diff --git a/common/Makefile.am b/common/Makefile.am
index b9cba11..e0f4b80 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -30,7 +30,7 @@ TESTS = $(jnlib_tests) $(module_tests)
BUILT_SOURCES = audit-events.h status-codes.h
-CLEANFILES = audit-events.h status-codes.h
+MAINTAINERCLEANFILES = audit-events.h status-codes.h
AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl
-----------------------------------------------------------------------
Summary of changes:
common/Makefile.am | 2 +-
configure.ac | 26 +++++++-------------------
po/de.po | 24 +++++++++++++++---------
3 files changed, 23 insertions(+), 29 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list