[Pkg-gnupg-commit] [gnupg2] 34/124: More change for common.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

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>
---
 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(-)

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"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git