[Pkg-privacy-commits] [flashproxy] 64/65: actually build reproducibly using SOURCE_DATE_EPOCH

[Ximin Luo]

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

infinity0 pushed a commit to branch _volatile-rc
in repository flashproxy.

commit b9e45d1abe8ac94ab757a5f3e5c8407eb5f5fb64
Author: Ximin Luo <infinity0 at pwned.gg>
Date:   Wed Jun 17 20:35:08 2015 +0200

    actually build reproducibly using SOURCE_DATE_EPOCH
---
 debian/changelog                            | 7 +++++++
 debian/control                              | 2 +-
 debian/rules                                | 2 +-
 debian/strip-nondeterminism/a2x             | 6 +++---
 debian/strip-nondeterminism/dpkg-sourcedate | 3 ---
 debian/strip-nondeterminism/help2man        | 5 -----
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e6d399e..4b5c352 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+flashproxy (1.7-4) UNRELEASED; urgency=medium
+
+  * Actually make the documentation build reproducibly.
+  * Use the recently-decided standard variable SOURCE_DATE_EPOCH.
+
+ -- Ximin Luo <infinity0 at pwned.gg>  Wed, 17 Jun 2015 19:47:53 +0200
+
 flashproxy (1.7-3) unstable; urgency=medium
 
   * Fix Vcs links.
diff --git a/debian/control b/debian/control
index 8d91dba..183754d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9),
  dh-autoreconf,
  dh-python,
  faketime,
- help2man,
+ help2man (>= 1.47.1),
  nodejs,
  node-optimist,
  openssl,
diff --git a/debian/rules b/debian/rules
index de50736..b63f248 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ DH_proxy = -S makefile -D proxy --
 DH_nodeproxy = -S makefile -D proxy/modules/nodejs --
 
 # reproducible documentation
-export SOURCEDATE := $(shell debian/strip-nondeterminism/dpkg-sourcedate)
+export SOURCE_DATE_EPOCH = $(shell date -d "$$(dpkg-parsechangelog --count 1 -SDate)" +%s)
 export PATH := $(CURDIR)/debian/strip-nondeterminism:$(PATH)
 
 # TODO(infinity0): handle setup-common.py better; currently we symlink it as a
diff --git a/debian/strip-nondeterminism/a2x b/debian/strip-nondeterminism/a2x
index fac5e8f..32a226a 100755
--- a/debian/strip-nondeterminism/a2x
+++ b/debian/strip-nondeterminism/a2x
@@ -1,5 +1,5 @@
 #!/bin/sh
 # Depends: faketime
-# Eventually the upstream tool should support SOURCEDATE internally.
-test -n "$SOURCEDATE" || { echo >&2 "$0: SOURCEDATE not set"; exit 255; }
-exec faketime -f "$(date -d "$SOURCEDATE" +'%Y-%m-%d %H:%M:%S')" /usr/bin/a2x "$@"
+# Eventually the upstream tool should support SOURCE_DATE_EPOCH internally.
+test -n "$SOURCE_DATE_EPOCH" || { echo >&2 "$0: SOURCE_DATE_EPOCH not set"; exit 255; }
+exec faketime -f "$(TZ=UTC date -d "@$SOURCE_DATE_EPOCH" +'%Y-%m-%d %H:%M:%S')" /usr/bin/a2x "$@"
diff --git a/debian/strip-nondeterminism/dpkg-sourcedate b/debian/strip-nondeterminism/dpkg-sourcedate
deleted file mode 100755
index be9cb53..0000000
--- a/debian/strip-nondeterminism/dpkg-sourcedate
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-export TZ=UTC # faketime uses UTC
-exec date -d "$(dpkg-parsechangelog --count 1 -SDate)" --iso-8601=seconds
diff --git a/debian/strip-nondeterminism/help2man b/debian/strip-nondeterminism/help2man
deleted file mode 100755
index 06373cf..0000000
--- a/debian/strip-nondeterminism/help2man
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-# Depends: faketime
-# Eventually the upstream tool should support SOURCEDATE internally.
-test -n "$SOURCEDATE" || { echo >&2 "$0: SOURCEDATE not set"; exit 255; }
-exec faketime -f "$(date -d "$SOURCEDATE" +'%Y-%m-%d %H:%M:%S')" /usr/bin/help2man "$@"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/flashproxy.git