[git] GnuPG - branch, master, updated. gnupg-2.1.0-beta895-3-g158fe90

[by Werner Koch]

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  158fe900183daf745821dea7a70cf1c673cd8de0 (commit)
       via  a59a8664592e7b66a31bbf0b79e1d2f5b45027ff (commit)
      from  436aa90be753b59bfb82684ae9ed8ff40b8c14ae (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 158fe900183daf745821dea7a70cf1c673cd8de0
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Oct 27 18:02:46 2014 +0100

    speedo: Fixes for native build.
    
    * build-aux/speedo.mk (TARGETOS): Init with empty string.
    (speedo_pkg_gnupg_configure): Use --enable-gpg2-is-gpg only for w32.
    (INST_VERSION, INST_PROD_VERSION): Create only for w32.

diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index 6d344f1..4f716d4 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -108,7 +108,7 @@ this-w32-source: check-tools
 WHAT=git
 
 # Set target to "native" or "w32"
-TARGETOS=w32
+TARGETOS=
 
 # Set to 1 to build the GUI tools
 WITH_GUI=0
@@ -382,16 +382,23 @@ speedo_pkg_libgcrypt_configure = --disable-static
 
 speedo_pkg_libksba_configure = --disable-static
 
+ifeq ($(TARGETOS),w32)
 speedo_pkg_gnupg_configure = --enable-gpg2-is-gpg --disable-g13
+else
+speedo_pkg_gnupg_configure = --disable-g13
+endif
 speedo_pkg_gnupg_extracflags = -g
 
+# Create the version info files only for W32 so that they won't get
+# installed if for example INSTALL_PREFIX=/usr/local is used.
+ifeq ($(TARGETOS),w32)
 define speedo_pkg_gnupg_post_install
 (set -e; \
  sed -n  's/.*PACKAGE_VERSION "\(.*\)"/\1/p' config.h >$(idir)/INST_VERSION; \
  sed -n  's/.*W32INFO_VI_PRODUCTVERSION \(.*\)/\1/p' common/w32info-rc.h \
     |sed 's/,/./g' >$(idir)/INST_PROD_VERSION )
 endef
-
+endif
 
 # The LDFLAGS is needed for -lintl for glib.
 speedo_pkg_gpgme_configure = \
@@ -566,13 +573,19 @@ endif
 BUILD_ISODATE=$(shell date -u +%Y-%m-%d)
 
 # The next two macros will work only after gnupg has been build.
+ifeq ($(TARGETOS),w32)
 INST_VERSION=$(shell head -1 $(idir)/INST_VERSION)
 INST_PROD_VERSION=$(shell head -1 $(idir)/INST_PROD_VERSION)
+endif
 
 # List with packages
 speedo_build_list = $(speedo_spkgs)
 speedo_w64_build_list = $(speedo_w64_spkgs)
 
+# To avoid running external commands during the read phase (":=" style
+# assignments), we check that the targetos has been given
+ifneq ($(TARGETOS),)
+
 # Determine build and host system
 build := $(shell $(topsrc)/autogen.sh --silent --print-build)
 ifeq ($(TARGETOS),w32)
@@ -596,6 +609,9 @@ else
   speedo_makeopt=-j$(MAKE_J)
 endif
 
+# End non-empty TARGETOS
+endif
+
 
 
 # The playground area is our scratch area, where we unpack, build and
@@ -975,6 +991,8 @@ clean-speedo:
 #
 # Windows installer
 #
+# {{{
+ifeq ($(TARGETOS),w32)
 
 dist-source: all
 	for i in 00 01 02 03; do sleep 1;touch PLAY/stamps/stamp-*-${i}-*;done
@@ -1028,6 +1046,10 @@ installer: all w32_insthelpers $(w32src)/inst-options.ini $(bdir)/README.txt
 		    $(w32src)/inst.nsi
 	@echo "Ready: $(idir)/$(INST_NAME)-$(INST_VERSION)"
 
+endif
+# }}} W32
+
+
 #
 # Check availibility of standard tools
 #

commit a59a8664592e7b66a31bbf0b79e1d2f5b45027ff
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Oct 27 14:12:51 2014 +0100

    po: Fixed one wrong German string.
    
    --

diff --git a/po/de.po b/po/de.po
index 799291e..ec1ea50 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: 2014-10-26 12:38+0100\n"
+"PO-Revision-Date: 2014-10-27 14:12+0100\n"
 "Last-Translator: Werner Koch <wk at gnupg.org>\n"
 "Language-Team: German <de at li.org>\n"
 "Language: de\n"
@@ -7795,7 +7795,7 @@ msgid "Directory Manager"
 msgstr "Directory Manager"
 
 msgid "PIN and Passphrase Entry"
-msgstr "Falsche PIN oder Passphrase!"
+msgstr "PIN und Passphrase Eingabe"
 
 msgid "Component not suitable for launching"
 msgstr "Komponente unterstützt kein direktes starten"

-----------------------------------------------------------------------

Summary of changes:
 build-aux/speedo.mk |   26 ++++++++++++++++++++++++--
 po/de.po            |    4 ++--
 2 files changed, 26 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org