chiark / gitweb /
avoid regenerating defsincdate (use shipped file)
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 29 Aug 2016 16:34:42 +0000 (12:34 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 3 Jan 2017 20:39:52 +0000 (20:39 +0000)
upstream ships doc/defsincdate in its tarballs.  but doc/Makefile.am
tries to rewrite doc/defsincdate if it notices that any of the files
have been modified more recently, and it does so assuming that we're
running from a git repo.

However, we'd rather ship the documents cleanly without regenerating
defsincdate -- we don't have a git repo available (debian builds from
upstream tarballs) and any changes to the texinfo files (e.g. from
debian/patches/) might result in different dates on the files than we
expect after they're applied by dpkg or quilt or whatever, which makes
the datestamp unreproducible.

Gbp-Pq: Topic debian-packaging
Gbp-Pq: Name 0003-avoid-regenerating-defsincdate-use-shipped-file.patch

doc/Makefile.am

index 0c2f2c9..65b941c 100644 (file)
@@ -167,13 +167,6 @@ $(myman_pages) gnupg.7 : yat2m-stamp defs.inc
 
 dist-hook: defsincdate
 
-defsincdate: $(gnupg_TEXINFOS)
-       : >defsincdate ; \
-       if test -e $(top_srcdir)/.git; then \
-         (cd $(srcdir) && git log -1 --format='%ct' \
-               -- $(gnupg_TEXINFOS) 2>/dev/null) >>defsincdate; \
-       fi
-
 defs.inc : defsincdate Makefile mkdefsinc
        incd="`test -f defsincdate || echo '$(srcdir)/'`defsincdate"; \
        ./mkdefsinc -C $(srcdir) --date "`cat $$incd 2>/dev/null`" \