debian/changelog | 9 +++++++++
debian/rules | 2 --
xsf-docs/Makefile | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit e42da817e61e711b3e559c0b98d52057d3882ff2
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Tue Oct 13 11:15:55 2015 +0200
rules: Remove unused variable ARCH.
Unused since 77979396b7aaea897efe64213f8fb0f3a105708f
diff --git a/debian/changelog b/debian/changelog
index 1ec5dc2..e38c23a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xorg (1:7.7+13) UNRELEASED; urgency=medium
* Merge xsf-docs up to 13946cb commit:
- makefile: Set TZ=UTC before calling asciidoc (Closes: #795985).
Thanks, Eduard Sanou!
+ * rules: Remove unused variable ARCH.
-- Andreas Boll <andreas.boll....@gmail.com> Tue, 13 Oct 2015 11:04:42 +0200
diff --git a/debian/rules b/debian/rules
index 1e7c76e..9d9d9b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
#!/usr/bin/make -f
-ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
%:
dh $@ --parallel
commit 8d3a0c80be2cd169955cc93407822e3e6e90ec47
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Tue Oct 13 11:11:23 2015 +0200
Bump changelog
diff --git a/debian/changelog b/debian/changelog
index 3039d0c..1ec5dc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.7+13) UNRELEASED; urgency=medium
+
+ * Merge xsf-docs up to 13946cb commit:
+ - makefile: Set TZ=UTC before calling asciidoc (Closes: #795985).
+ Thanks, Eduard Sanou!
+
+ -- Andreas Boll <andreas.boll....@gmail.com> Tue, 13 Oct 2015 11:04:42 +0200
+
xorg (1:7.7+12) unstable; urgency=medium
* Team upload.
commit 13946cb1c242fb81037189e706350cd0c55903bb
Author: Eduard Sanou <dh...@openmailbox.org>
Date: Tue Oct 13 10:59:27 2015 +0200
makefile: Set TZ=UTC before calling asciidoc
Set TZ=UTC before calling asciidoc to make the embedded dates invariant
to timezones in order to make the package build reproducibly.
diff --git a/xsf-docs/Makefile b/xsf-docs/Makefile
index cbd375c..04d1560 100644
--- a/xsf-docs/Makefile
+++ b/xsf-docs/Makefile
@@ -6,7 +6,7 @@ html_files = $(patsubst %.txt,%.html,$(txt_files))
pdf_files = $(patsubst %.txt,%.pdf,$(txt_files))
-TXT_TO_HTML = asciidoc -a linkcss
+TXT_TO_HTML = TZ=UTC asciidoc -a linkcss
HTML_TO_PDF = wkhtmltopdf
CSS_FILE = xsf.css
ADOC_CSS_FILE= asciidoc-xhtml11.css
