[git] GnuPG - branch, master, updated. gnupg-2.1.19-34-gd6c7bf1

by NIIBE Yutaka cvs at cvs.gnupg.org
Tue Mar 7 12:33:11 CET 2017


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  d6c7bf1f8ab8899faba2fb81a35b096921c38f3c (commit)
      from  70aca95d6816082b289fceca8eabfcf718a6b701 (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 d6c7bf1f8ab8899faba2fb81a35b096921c38f3c
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Mar 7 20:32:09 2017 +0900

    More change for common.
    
    * g10, scd, test, tools: Follow the change of removal of -Icommon.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c
index 61cc2ea..a7a8739 100644
--- a/g10/seckey-cert.c
+++ b/g10/seckey-cert.c
@@ -26,14 +26,14 @@
 #include <string.h>
 
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "packet.h"
 #include "keydb.h"
 #include "cipher.h"
 #include "main.h"
 #include "options.h"
-#include "i18n.h"
-#include "status.h"
+#include "../common/i18n.h"
+#include "../common/status.h"
 #include "pkglue.h"
 
 static int
diff --git a/scd/iso7816.c b/scd/iso7816.c
index 8f79698..d146bd0 100644
--- a/scd/iso7816.c
+++ b/scd/iso7816.c
@@ -32,8 +32,8 @@
 #include "options.h"
 #include "errors.h"
 #include "memory.h"
-#include "util.h"
-#include "i18n.h"
+#include "../common/util.h"
+#include "../common/i18n.h"
 #else /* GNUPG_MAJOR_VERSION != 1 */
 #include "scdaemon.h"
 #endif /* GNUPG_MAJOR_VERSION != 1 */
diff --git a/tests/gpgscm/main.c b/tests/gpgscm/main.c
index 3191e05..65929f0 100644
--- a/tests/gpgscm/main.c
+++ b/tests/gpgscm/main.c
@@ -34,7 +34,7 @@
 #include "scheme.h"
 #include "scheme-private.h"
 #include "ffi.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "../../common/argparse.h"
 #include "../../common/init.h"
 #include "../../common/logging.h"
diff --git a/tools/no-libgcrypt.c b/tools/no-libgcrypt.c
index b56cc38..8739968 100644
--- a/tools/no-libgcrypt.c
+++ b/tools/no-libgcrypt.c
@@ -18,7 +18,7 @@
 #include <errno.h>
 
 #include "../common/util.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 
 
 /* Replace libgcrypt's malloc functions which are used by
diff --git a/tools/symcryptrun.c b/tools/symcryptrun.c
index b32d43a..563e56b 100644
--- a/tools/symcryptrun.c
+++ b/tools/symcryptrun.c
@@ -98,7 +98,7 @@
 #endif
 #include <gpg-error.h>
 
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "../common/util.h"
 #include "../common/init.h"
 #include "../common/sysutils.h"

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

Summary of changes:
 g10/seckey-cert.c    | 6 +++---
 scd/iso7816.c        | 4 ++--
 tests/gpgscm/main.c  | 2 +-
 tools/no-libgcrypt.c | 2 +-
 tools/symcryptrun.c  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)


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




More information about the Gnupg-commits mailing list