GnuPG with scdaemon_shared-access patch applied
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 

44 lines
1.5 KiB

  1. From 3e8ff68502bf5de333db7213d9e27e0b9e8cc36e Mon Sep 17 00:00:00 2001
  2. From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
  3. Date: Mon, 29 Aug 2016 12:34:42 -0400
  4. Subject: [PATCH 7/7] avoid regenerating defsincdate (use shipped file)
  5. upstream ships doc/defsincdate in its tarballs. but doc/Makefile.am
  6. tries to rewrite doc/defsincdate if it notices that any of the files
  7. have been modified more recently, and it does so assuming that we're
  8. running from a git repo.
  9. However, we'd rather ship the documents cleanly without regenerating
  10. defsincdate -- we don't have a git repo available (debian builds from
  11. upstream tarballs) and any changes to the texinfo files (e.g. from
  12. debian/patches/) might result in different dates on the files than we
  13. expect after they're applied by dpkg or quilt or whatever, which makes
  14. the datestamp unreproducible.
  15. ---
  16. doc/Makefile.am | 7 -------
  17. 1 file changed, 7 deletions(-)
  18. diff --git a/doc/Makefile.am b/doc/Makefile.am
  19. index d47d83ede..c0a81b0b9 100644
  20. --- a/doc/Makefile.am
  21. +++ b/doc/Makefile.am
  22. @@ -177,15 +177,6 @@
  23. dist-hook: defsincdate
  24. -defsincdate: $(gnupg_TEXINFOS)
  25. - : >defsincdate ; \
  26. - if test -e $(top_srcdir)/.git; then \
  27. - (cd $(srcdir) && git log -1 --format='%ct' \
  28. - -- $(gnupg_TEXINFOS) 2>/dev/null) >>defsincdate; \
  29. - elif test x"$SOURCE_DATE_EPOCH" != x; then \
  30. - echo "$SOURCE_DATE_EPOCH" >>defsincdate ; \
  31. - fi
  32. -
  33. defs.inc : defsincdate Makefile mkdefsinc
  34. incd="`test -f defsincdate || echo '$(srcdir)/'`defsincdate"; \
  35. ./mkdefsinc -C $(srcdir) --date "`cat $$incd 2>/dev/null`" \
  36. --
  37. 2.27.0