[Pkg-gnupg-commit] [libgpg-error] 01/05: yat2m updates from upstream, now respects SOURCE_DATE_EPOCH
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Fri Oct 27 17:35:30 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository libgpg-error.
commit 16f02f4ceebff4181589b86f54b74e75b7fe90f7
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Fri Oct 27 13:21:09 2017 -0400
yat2m updates from upstream, now respects SOURCE_DATE_EPOCH
---
.../0008-doc-Implement-simple-ref-erences.patch | 24 ++++++++++++
debian/patches/0009-doc-minor-fix-for-xref.patch | 24 ++++++++++++
debian/patches/0010-doc-Typo-fix.patch | 24 ++++++++++++
...0011-yat2m-Take-care-of-SOURCE_DATE_EPOCH.patch | 43 ++++++++++++++++++++++
debian/patches/series | 5 +++
5 files changed, 120 insertions(+)
diff --git a/debian/patches/0008-doc-Implement-simple-ref-erences.patch b/debian/patches/0008-doc-Implement-simple-ref-erences.patch
new file mode 100644
index 0000000..0798b02
--- /dev/null
+++ b/debian/patches/0008-doc-Implement-simple-ref-erences.patch
@@ -0,0 +1,24 @@
+From: Justus Winter <justus at g10code.com>
+Date: Mon, 19 Sep 2016 15:25:01 +0200
+Subject: doc: Implement simple '@ref'erences.
+
+* doc/yat2m.c (proc_texi_cmd): Handle '@ref'.
+
+Signed-off-by: Justus Winter <justus at g10code.com>
+(cherry picked from commit 55d560358f7ee4a8b68f98e051021a05d4c0bb1f)
+---
+ doc/yat2m.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+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)" },
diff --git a/debian/patches/0009-doc-minor-fix-for-xref.patch b/debian/patches/0009-doc-minor-fix-for-xref.patch
new file mode 100644
index 0000000..efa561a
--- /dev/null
+++ b/debian/patches/0009-doc-minor-fix-for-xref.patch
@@ -0,0 +1,24 @@
+From: NIIBE Yutaka <gniibe at fsij.org>
+Date: Tue, 20 Sep 2016 15:41:36 +0900
+Subject: doc: minor fix for @xref.
+
+* doc/yat2m.c (proc_texi_cmd): Captalize "see" for xref.
+
+(cherry picked from commit 187e2ad24fb92210587beb779a1cc746821a169c)
+---
+ doc/yat2m.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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, " ([", "])" },
diff --git a/debian/patches/0010-doc-Typo-fix.patch b/debian/patches/0010-doc-Typo-fix.patch
new file mode 100644
index 0000000..18e9501
--- /dev/null
+++ b/debian/patches/0010-doc-Typo-fix.patch
@@ -0,0 +1,24 @@
+From: Werner Koch <wk at gnupg.org>
+Date: Wed, 5 Jul 2017 09:01:59 +0200
+Subject: doc: Typo fix
+
+--
+
+(cherry picked from commit d2aa2204cc7fc6b481412ed8ba9f65dfc64c6627)
+---
+ src/init.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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;
diff --git a/debian/patches/0011-yat2m-Take-care-of-SOURCE_DATE_EPOCH.patch b/debian/patches/0011-yat2m-Take-care-of-SOURCE_DATE_EPOCH.patch
new file mode 100644
index 0000000..6ddd16b
--- /dev/null
+++ b/debian/patches/0011-yat2m-Take-care-of-SOURCE_DATE_EPOCH.patch
@@ -0,0 +1,43 @@
+From: Werner Koch <wk at gnupg.org>
+Date: Wed, 5 Jul 2017 09:14:38 +0200
+Subject: 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>
+(cherry picked from commit 5494a5728418938d2e42158bb646b07124184e64)
+---
+ doc/yat2m.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+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, "-"))
+ {
diff --git a/debian/patches/series b/debian/patches/series
index 9d2bce0..def2dbd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,8 @@
0005-Fix-memory-leak-for-estream.patch
0006-build-Prepend-the-maintainer-CFLAGS.patch
0007-Align-es_poll-semantics-closer-with-POSIX.patch
+0008-doc-Implement-simple-ref-erences.patch
+0009-doc-minor-fix-for-xref.patch
+0010-doc-Typo-fix.patch
+0011-yat2m-Take-care-of-SOURCE_DATE_EPOCH.patch
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libgpg-error.git
More information about the Pkg-gnupg-commit
mailing list