[beignet] 01/02: Remove multiarch-breaking timestamps (Closes: #840768)

Rebecca Palmer rnpalmer-guest at moszumanska.debian.org
Sun Oct 16 14:34:13 UTC 2016


This is an automated email from the git hooks/post-receive script.

rnpalmer-guest pushed a commit to branch master
in repository beignet.

commit a374f8220405cfdf49b226f70c14953813831b3c
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Sun Oct 16 14:30:41 2016 +0100

    Remove multiarch-breaking timestamps (Closes: #840768)
---
 debian/changelog | 6 ++++++
 debian/rules     | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0d60eb6..521a1fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+beignet (1.2.0-3) UNRELEASED; urgency=medium
+
+  * Remove multiarch-breaking timestamps.  (Closes: #840768)
+
+ -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Sun, 16 Oct 2016 14:28:17 +0100
+
 beignet (1.2.0-2) unstable; urgency=medium
 
   * Fix FTBFS on kfreebsd-*.  (Closes: #840045)
diff --git a/debian/rules b/debian/rules
index 2530d81..c41d745 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,11 +24,16 @@ override_dh_auto_configure:
 	ls -la include/CL
 	dh_auto_configure --buildsystem cmake -- -DLLVM_INSTALL_DIR=/usr/lib/llvm-$(LLVM_VERSION)/bin
 
-#Include the test suite and the documentation
+#Include the documentation, without timestamps (which break multiarch because debian/patches/update-docs.patch etc are applied at build time - #840678)
 override_dh_auto_build:
 	dh_auto_build
 	ikiwiki --verbose --no-usedirs --underlaydir docs --plugin map --rebuild docs docs_build
 	rm -rf docs_build/ikiwiki
+	for HTMLFILE in `find $(CURDIR)/docs_build/ -name *.html` ; do \
+	  sed -e "s;Last edited <span class=.date.>.*;;" $$HTMLFILE > $$HTMLFILE.tmp ; \
+	  sed -e "s;<!-- Created <span class=.date.>.*;;" $$HTMLFILE.tmp > $$HTMLFILE ; \
+	  rm $$HTMLFILE.tmp ; \
+	done
 
 override_dh_gencontrol:
 	dh_gencontrol -- -VBuilt-Using:clang="$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), \n' -W libclang-$(LLVM_VERSION)-dev)"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/beignet.git



More information about the Pkg-opencl-commits mailing list