Merge branch 'debian-sid' into debian-stable-backports
* debian-sid: (851 commits)
debian: new upstream point release
debian/git-gui: Suggests: meld
Git 2.20.1
.gitattributes: ensure t/oid-info/* has eol=lf
t9902: 'send-email' test case requires PERL
t4256: mark support files as LF-only
parse-options: fix SunCC compiler warning
help -a: handle aliases with long names gracefully
help.h: fix coding style
run-command: report exec failure
debian: new upstream release
Git 2.20
l10n: de.po: fix two messages
l10n: zh_CN: for git v2.20.0 l10n round 1 to 3
l10n: update German translation
debian/control: add Recommends against ca-certificates
rebase docs: fix incorrect format of the section Behavioral Differences
RelNotes 2.20: drop spurious double quote
RelNotes 2.20: clarify sentence
RelNotes 2.20: move some items between sections
...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
diff --git a/debian/changelog b/debian/changelog
index b0edb09..780fdc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git (1:2.20.1-1~bpo9+1) stretch-backports; urgency=low
+
+ * merge branch debian-sid.
+
+ -- Jonathan Nieder <jrnieder@gmail.com> Sat, 05 Jan 2019 14:12:21 -0800
+
git (1:2.20.1-1) unstable; urgency=medium
* new upstream point release (see RelNotes/2.20.1.txt).
@@ -29,6 +35,12 @@
-- Jonathan Nieder <jrnieder@gmail.com> Sun, 25 Nov 2018 11:47:53 -0800
+git (1:2.19.2-1~bpo9+1) stretch-backports; urgency=high
+
+ * merge branch debian-sid.
+
+ -- Jonathan Nieder <jrnieder@gmail.com> Sun, 25 Nov 2018 11:33:19 -0800
+
git (1:2.19.2-1) unstable; urgency=high
* new upstream point release (see RelNotes/2.19.2.txt).
@@ -36,6 +48,12 @@
-- Jonathan Nieder <jrnieder@gmail.com> Thu, 22 Nov 2018 14:48:49 -0800
+git (1:2.19.1-1~bpo9+1) stretch-backports; urgency=high
+
+ * merge branch debian-sid.
+
+ -- Jonathan Nieder <jrnieder@gmail.com> Fri, 05 Oct 2018 10:29:07 -0700
+
git (1:2.19.1-1) unstable; urgency=high
* new upstream point release (see RelNotes/2.19.1.txt,
@@ -43,6 +61,12 @@
-- Jonathan Nieder <jrnieder@gmail.com> Fri, 05 Oct 2018 10:10:45 -0700
+git (1:2.19.0-1~bpo9+1) stretch-backports; urgency=low
+
+ * merge branch debian-sid.
+
+ -- Jonathan Nieder <jrnieder@gmail.com> Wed, 26 Sep 2018 19:23:09 -0700
+
git (1:2.19.0-1) unstable; urgency=low
* new upstream release (see RelNotes/2.19.0.txt).
@@ -76,6 +100,12 @@
-- Jonathan Nieder <jrnieder@gmail.com> Tue, 28 Aug 2018 13:48:50 -0700
+git (1:2.18.0-1~bpo9+1) stretch-backports; urgency=low
+
+ * merge branch debian-sid.
+
+ -- Jonathan Nieder <jrnieder@gmail.com> Mon, 02 Jul 2018 14:17:27 -0700
+
git (1:2.18.0-1) unstable; urgency=low
* new upstream release (see RelNotes/2.18.0.txt).
@@ -99,6 +129,12 @@
-- Jonathan Nieder <jrnieder@gmail.com> Mon, 18 Jun 2018 09:19:59 -0700
+git (1:2.17.1-1~bpo9+1) stretch-backports; urgency=high
+
+ * merge branch debian-sid.
+
+ -- Jonathan Nieder <jrnieder@gmail.com> Tue, 29 May 2018 09:52:00 -0700
+
git (1:2.17.1-1) unstable; urgency=high
* new upstream point release to fix CVE-2018-11235, arbitary code
@@ -106,6 +142,18 @@
-- Jonathan Nieder <jrnieder@gmail.com> Mon, 28 May 2018 17:37:54 -0700
+git (1:2.17.0-1~bpo9+1) stretch-backports; urgency=low
+
+ * debian/control: avoid build-time dependency on asciidoc version
+ that is not available in stretch:
+ * debian/patches/Normalize-generated-asciidoc-timestamps-...diff:
+ use SOURCE_DATE_EPOCH in "last updated" footer (thx Anders
+ Kaseorg; see #782294).
+ * debian/control: remove build-time dependency on version of
+ asciidoc that supports SOURCE_DATE_EPOCH natively.
+
+ -- Jonathan Nieder <jrnieder@gmail.com> Fri, 25 May 2018 23:41:06 -0700
+
git (1:2.17.0-1) unstable; urgency=low
* new upstream release (see RelNotes/2.17.0.txt).
diff --git a/debian/control b/debian/control
index b36d764..259508e 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@
dh-exec (>= 0.7),
dh-apache2,
dpkg-dev (>= 1.16.2~)
-Build-Depends-Indep: asciidoc (>= 8.6.10), xmlto, docbook-xsl
+Build-Depends-Indep: asciidoc, xmlto, docbook-xsl
Standards-Version: 4.1.5.0
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
new file mode 100644
index 0000000..c514460
--- /dev/null
+++ b/debian/patches/Normalize-generated-asciidoc-timestamps-with-SOURCE_D.diff
@@ -0,0 +1,58 @@
+From a7eae39099ef4c0d9e515697b6e60d42b181b0cb Mon Sep 17 00:00:00 2001
+From: Anders Kaseorg <andersk@mit.edu>
+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 <andersk@mit.edu>
+Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+---
+ 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 95f6a321f2..642cd6cf8a 100644
+--- a/Documentation/Makefile
++++ b/Documentation/Makefile
+@@ -414,6 +414,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
+@@ -424,8 +425,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.20.0.rc0.387.gc7a69e6b6c
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..31fc49f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Normalize-generated-asciidoc-timestamps-with-SOURCE_D.diff
