[gle-graphics] 01/01: Imported Debian patch 4.2.5-4

Christian T. Steigies cts at moszumanska.debian.org
Tue Mar 29 10:35:33 UTC 2016


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

cts pushed a commit to branch master
in repository gle-graphics.

commit 53d11ee7d53d97cec6c13ab61b545d7e757e9099
Author: Christian T. Steigies <cts at debian.org>
Date:   Tue Mar 29 11:48:58 2016 +0200

    Imported Debian patch 4.2.5-4
---
 debian/changelog           |  6 ++++++
 debian/control             |  1 +
 debian/patches/static-time | 18 ++++++++++++++++++
 debian/rules               | 11 ++++++++---
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 68a7fa6..c82fa37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gle-graphics (4.2.5-4) unstable; urgency=medium
+
+  * use faketime to build gle-manual PDF files reproducibly
+
+ -- Christian T. Steigies <cts at debian.org>  Tue, 29 Mar 2016 11:48:58 +0200
+
 gle-graphics (4.2.5-3) unstable; urgency=medium
 
   * replace today in manual with SOURCE_DATE to build reproducibly
diff --git a/debian/control b/debian/control
index bbf4537..2fca03e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends: automake,
                autotools-dev,
                debhelper (>= 9),
                dh-autoreconf,
+               faketime,
                ghostscript,
                libboost-dev,
                libcairo-dev,
diff --git a/debian/patches/static-time b/debian/patches/static-time
new file mode 100644
index 0000000..5804487
--- /dev/null
+++ b/debian/patches/static-time
@@ -0,0 +1,18 @@
+Description: replace time$() with static time string for manual
+ To build reproducibly time$() is replaced with a static time string.
+ This is not needed when then manual is built with faketime
+Author: Christian T. Steigies <cts at debian.org>
+Last-Update: 2016-03-28
+Index: gle-graphics-4.2.5/gle-refman/primitives/fig/gc_write.gle
+===================================================================
+--- gle-graphics-4.2.5.orig/gle-refman/primitives/fig/gc_write.gle
++++ gle-graphics-4.2.5/gle-refman/primitives/fig/gc_write.gle
+@@ -44,7 +44,7 @@ begin origin
+   amove 3 .5 
+   a$ = "Hello there "
+   xx = sqrt(10)
+-  t$ = time$()
++  t$ = "12:34:56"
+   c$ = a$+t$ 
+   write a$+t$ xx
+ end origin
diff --git a/debian/rules b/debian/rules
index 3ab0d10..3617f62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,10 +13,15 @@ endif
 SOURCE_DATE_EPOCH=$(shell date -d "$$(dpkg-parsechangelog --count 1 -SDate)" +%s)
 export DEB_CPPFLAGS_MAINT_APPEND = -DDEBIAN_EPOCH=$(SOURCE_DATE_EPOCH)
 
-# source date string for gle-manual
-DATE_FMT = %B %d, %Y
+# source date string instead of \today in gle-manual
+# use only digits, locale month is not reproducible
+DATE_FMT = %Y-%m-%d
 SOURCE_DATE ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)"  2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)" 2>/dev/null || date -u "+$(DATE_FMT)")
 
+# source datetime string for building gle-manual.pdf
+DATETIME_FMT = %Y-%m-%d %H:%M:%S
+SOURCE_DATETIME ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+$(DATETIME_FMT)"  2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+$(DATETIME_FMT)" 2>/dev/null || date -u "+$(DATETIME_FMT)")
+
 %:
 #	dh $@ --with autoreconf
 	dh $@ --with autotools_dev
@@ -25,7 +30,7 @@ SOURCE_DATE ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)"  2>/dev
 override_dh_auto_build:
 	make
 	echo $(SOURCE_DATE) > gle-refman/title/source_date.tex
-	make doc
+	faketime -f "$(SOURCE_DATETIME)" make doc
 
 override_dh_auto_clean:
 	[ ! -f Makefile ] || make distclean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gle-graphics.git



More information about the debian-science-commits mailing list