From b29eb7eb05a1e5551a4c73b13b40952ddc4434e0 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Wed, 29 Nov 2017 13:40:02 -0800 Subject: [PATCH] debian: rely on asciidoc 8.6.10 for SOURCE_DATE_EPOCH support This allows one of the patches in debian/patches/ to be removed, simplifying the package and making the source code used more similar to the unpatched upstream source. Signed-off-by: Jonathan Nieder --- debian/changelog | 3 ++ debian/control | 2 +- ...enerated-asciidoc-timestamps-with-SOURCE_D.diff | 57 ---------------------- debian/patches/series | 1 - 4 files changed, 4 insertions(+), 59 deletions(-) delete mode 100644 debian/patches/Normalize-generated-asciidoc-timestamps-with-SOURCE_D.diff diff --git a/debian/changelog b/debian/changelog index 3754795b9f..c4ed32f89e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ git (1:2.15.0-1.1) unstable; urgency=low + * debian/control: Build-Depends-Indep: asciidoc (>= 8.6.10). + * debian/patches/Normalize-generated-asciidoc-timestamps-...diff: + remove; no longer needed (thx Anders Kaseorg; see #782294). * debian/control: Standards-Version: 4.1.1.1. -- Jonathan Nieder Wed, 29 Nov 2017 13:24:55 -0800 diff --git a/debian/control b/debian/control index 1c04e76974..1215315b7e 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: libz-dev, gettext, dh-exec (>= 0.7), dh-apache2, dpkg-dev (>= 1.16.2~) -Build-Depends-Indep: asciidoc, xmlto, docbook-xsl +Build-Depends-Indep: asciidoc (>= 8.6.10), xmlto, docbook-xsl Standards-Version: 4.1.1.1 Homepage: https://git-scm.com/ Vcs-Git: https://repo.or.cz/r/git/debian.git/ diff --git a/debian/patches/Normalize-generated-asciidoc-timestamps-with-SOURCE_D.diff b/debian/patches/Normalize-generated-asciidoc-timestamps-with-SOURCE_D.diff deleted file mode 100644 index 48ea691765..0000000000 --- a/debian/patches/Normalize-generated-asciidoc-timestamps-with-SOURCE_D.diff +++ /dev/null @@ -1,57 +0,0 @@ -From f66c008e0d20887afd3a735bc686ab7b5b40123d Mon Sep 17 00:00:00 2001 -From: Anders Kaseorg -Date: Wed, 30 Nov 2016 22:21:15 -0500 -Subject: Normalize generated asciidoc timestamps with SOURCE_DATE_EPOCH - -This is needed to pass the Debian build reproducibility test -(https://wiki.debian.org/ReproducibleBuilds/TimestampsProposal). - -Signed-off-by: Anders Kaseorg ---- - Documentation/Makefile | 7 +++++-- - Documentation/technical/api-index.sh | 4 ++++ - 2 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/Documentation/Makefile b/Documentation/Makefile -index 471bb29725..a7fac2161e 100644 ---- a/Documentation/Makefile -+++ b/Documentation/Makefile -@@ -404,6 +404,7 @@ $(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml - howto-index.txt: howto-index.sh $(wildcard howto/*.txt) - $(QUIET_GEN)$(RM) $@+ $@ && \ - '$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(wildcard howto/*.txt)) >$@+ && \ -+ $(if $(SOURCE_DATE_EPOCH),touch -d '@$(SOURCE_DATE_EPOCH)' $@+ &&) \ - mv $@+ $@ - - $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt -@@ -414,8 +415,10 @@ WEBDOC_DEST = /pub/software/scm/git/docs - howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../ - $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt - $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ -- sed -e '1,/^$$/d' $< | \ -- $(TXT_TO_HTML) - >$@+ && \ -+ sed -e '1,/^$$/d' $< > $<+ && \ -+ $(if $(SOURCE_DATE_EPOCH),touch -d '@$(SOURCE_DATE_EPOCH)' $<+ &&) \ -+ $(TXT_TO_HTML) -o $@+ $<+ && \ -+ rm $<+ && \ - mv $@+ $@ - - install-webdoc : html -diff --git a/Documentation/technical/api-index.sh b/Documentation/technical/api-index.sh -index 9c3f4131b8..87c9a9d223 100755 ---- a/Documentation/technical/api-index.sh -+++ b/Documentation/technical/api-index.sh -@@ -20,6 +20,10 @@ - sed -n -e '/^\/\/ table of contents end/,$p' "$skel" - ) >api-index.txt+ - -+if [ "$SOURCE_DATE_EPOCH" ]; then -+ touch -d "@$SOURCE_DATE_EPOCH" api-index.txt+ -+fi -+ - if test -f api-index.txt && cmp api-index.txt api-index.txt+ >/dev/null - then - rm -f api-index.txt+ --- -2.15.0.rc0.271.g36b669edcc - diff --git a/debian/patches/series b/debian/patches/series index 323ca90d90..b5b3ebe806 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -Normalize-generated-asciidoc-timestamps-with-SOURCE_D.diff git-gui-Sort-entries-in-optimized-tclIndex.diff -- 2.11.4.GIT