[git] GPG-ERROR - branch, master, updated. libgpg-error-1.27-14-g0148ea8
by Werner Koch
cvs at cvs.gnupg.org
Wed Jul 5 10:19:21 CEST 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 "Error codes used by GnuPG et al.".
The branch, master has been updated
via 0148ea8d5acde2ad5d0376fb7eaa2221e88f258a (commit)
via d81b1379edbc6007a89c3b2fff1b51c8dfe2e868 (commit)
via 5494a5728418938d2e42158bb646b07124184e64 (commit)
via d2aa2204cc7fc6b481412ed8ba9f65dfc64c6627 (commit)
via 187e2ad24fb92210587beb779a1cc746821a169c (commit)
via 55d560358f7ee4a8b68f98e051021a05d4c0bb1f (commit)
from 4a9857a2b6d8a8e847638416d35398508b3291fd (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 0148ea8d5acde2ad5d0376fb7eaa2221e88f258a
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jul 5 10:14:00 2017 +0200
yat2m: Use version from libgpg-error.
* doc/yat2m.c (VERSION): Define as PACKAGE_VERSION.
* doc/Makefile.am (yat2m): Pass PACKAGE_VERSION with -D.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 849c661..d052283 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -35,7 +35,8 @@ myman_pages = gpg-error-config.1
man_MANS = $(myman_pages)
yat2m: yat2m.c
- $(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
+ $(CC_FOR_BUILD) -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
+ -o $@ $(srcdir)/yat2m.c
yat2m-stamp: $(myman_sources)
diff --git a/doc/yat2m.c b/doc/yat2m.c
index 184d27b..27db491 100644
--- a/doc/yat2m.c
+++ b/doc/yat2m.c
@@ -128,7 +128,11 @@
#define PGM "yat2m"
-#define VERSION "1.0"
+#ifdef PACKAGE_VERSION
+# define VERSION PACKAGE_VERSION
+#else
+# define VERSION "1.0"
+#endif
/* The maximum length of a line including the linefeed and one extra
character. */
commit d81b1379edbc6007a89c3b2fff1b51c8dfe2e868
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jul 5 10:08:13 2017 +0200
build: Install yat2m.
* doc/Makefile.am (install-exec-hook): New.
(uninstall-local): Uninstall yat2m.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/NEWS b/NEWS
index bfea6e0..687e185 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,9 @@
Noteworthy changes in version 1.28 (unreleased) [C22/A22/R_]
-----------------------------------------------
+ * The formerly internal yat2m tool is now installed during a native
+ build.
+
* Interface changes relative to the 1.27 release:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 565bb09..849c661 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -71,9 +71,22 @@ errorref.txt.x : errorref.txt
sed '/^##/ d' $< >$@
echo "# Installed by $(PACKAGE_NAME) $(PACKAGE_VERSION)" >>$@
+install-exec-hook:
+if CROSS_COMPILING
+ @echo "not install yat2m while cross-compiling"
+else
+ @echo "installing yat2m on the build system"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) \
+ yat2m "$(DESTDIR)$(bindir)/yat2m"
+endif
+
install-data-local: errorref.txt.x
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
$(INSTALL_DATA) errorref.txt.x $(DESTDIR)$(pkgdatadir)/errorref.txt
uninstall-local:
- at rm $(DESTDIR)$(pkgdatadir)/errorref.txt
+if !CROSS_COMPILING
+ - at rm $(DESTDIR)$(bindir)/yat2m
+endif
commit 5494a5728418938d2e42158bb646b07124184e64
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jul 5 09:14:38 2017 +0200
yat2m: Take care of SOURCE_DATE_EPOCH.
* doc/yat2m.c (main): Set a default for OPT_DATE.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/doc/yat2m.c b/doc/yat2m.c
index 23fc6ba..184d27b 100644
--- a/doc/yat2m.c
+++ b/doc/yat2m.c
@@ -1,5 +1,5 @@
/* yat2m.c - Yet Another Texi 2 Man converter
- * Copyright (C) 2005, 2013, 2015, 2016 g10 Code GmbH
+ * Copyright (C) 2005, 2013, 2015, 2016, 2017 g10 Code GmbH
* Copyright (C) 2006, 2008, 2011 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
@@ -1478,6 +1478,7 @@ int
main (int argc, char **argv)
{
int last_argc = -1;
+ const char *s;
opt_source = "GNU";
opt_release = "";
@@ -1611,6 +1612,11 @@ main (int argc, char **argv)
if (argc > 1)
die ("usage: " PGM " [OPTION] [FILE] (try --help for more information)\n");
+ /* Take care of supplied timestamp for reproducible builds. See
+ * https://reproducible-builds.org/specs/source-date-epoch/ */
+ if (!opt_date && (s = getenv ("SOURCE_DATE_EPOCH")) && *s)
+ opt_date = s;
+
/* Start processing. */
if (argc && strcmp (*argv, "-"))
{
commit d2aa2204cc7fc6b481412ed8ba9f65dfc64c6627
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jul 5 09:01:59 2017 +0200
doc: Typo fix
--
diff --git a/src/init.c b/src/init.c
index a1ee505..b01e089 100644
--- a/src/init.c
+++ b/src/init.c
@@ -214,7 +214,7 @@ _gpg_err_set_errno (int err)
-/* Internal tracing functions. Except for TARCE_FP we use flockfile
+/* Internal tracing functions. Except for TRACE_FP we use flockfile
* and funlockfile to protect their use. */
static FILE *trace_fp;
static int trace_save_errno;
commit 187e2ad24fb92210587beb779a1cc746821a169c
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Tue Sep 20 15:41:36 2016 +0900
doc: minor fix for @xref.
* doc/yat2m.c (proc_texi_cmd): Captalize "see" for xref.
diff --git a/doc/yat2m.c b/doc/yat2m.c
index a63260b..23fc6ba 100644
--- a/doc/yat2m.c
+++ b/doc/yat2m.c
@@ -730,7 +730,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
{ "anchor", 7 },
{ "cartouche", 1 },
{ "ref", 0, "[", "]" },
- { "xref", 0, "see: [", "]" },
+ { "xref", 0, "See: [", "]" },
{ "pxref", 0, "see: [", "]" },
{ "uref", 0, "(\\fB", "\\fR)" },
{ "footnote",0, " ([", "])" },
commit 55d560358f7ee4a8b68f98e051021a05d4c0bb1f
Author: Justus Winter <justus at g10code.com>
Date: Mon Sep 19 15:25:01 2016 +0200
doc: Implement simple '@ref'erences.
* doc/yat2m.c (proc_texi_cmd): Handle '@ref'.
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/doc/yat2m.c b/doc/yat2m.c
index 9b76f19..a63260b 100644
--- a/doc/yat2m.c
+++ b/doc/yat2m.c
@@ -729,6 +729,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
{ "asis", 7 },
{ "anchor", 7 },
{ "cartouche", 1 },
+ { "ref", 0, "[", "]" },
{ "xref", 0, "see: [", "]" },
{ "pxref", 0, "see: [", "]" },
{ "uref", 0, "(\\fB", "\\fR)" },
-----------------------------------------------------------------------
Summary of changes:
NEWS | 3 +++
doc/Makefile.am | 16 +++++++++++++++-
doc/yat2m.c | 17 ++++++++++++++---
src/init.c | 2 +-
4 files changed, 33 insertions(+), 5 deletions(-)
hooks/post-receive
--
Error codes used by GnuPG et al.
http://git.gnupg.org
More information about the Gnupg-commits
mailing list