[Pkg-javascript-commits] [node-ws] 01/01: use standard SOURCE_DATE_EPOCH for reproducible documentation, which help2man now supports

[Ximin Luo]

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

infinity0-guest pushed a commit to branch master
in repository node-ws.

commit 4a9aaeb1aebbc24155419518a88844bbe5c953db
Author: Ximin Luo <infinity0 at pwned.gg>
Date:   Wed Jun 17 23:29:45 2015 +0200

    use standard SOURCE_DATE_EPOCH for reproducible documentation, which help2man now supports
---
 debian/changelog                            | 1 +
 debian/control                              | 3 +--
 debian/rules                                | 5 ++---
 debian/strip-nondeterminism/dpkg-sourcedate | 3 ---
 debian/strip-nondeterminism/help2man        | 5 -----
 5 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9108521..e9391fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 node-ws (0.7.2+ds1.349b7460-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Use standard SOURCE_DATE_EPOCH for reproducible documentation.
 
  -- Ximin Luo <infinity0 at pwned.gg>  Wed, 17 Jun 2015 19:02:21 +0200
 
diff --git a/debian/control b/debian/control
index 75e3331..ec6d085 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,7 @@ Uploaders: Ximin Luo <infinity0 at pwned.gg>, Jérémy Lal <kapouer at melix.org>
 Build-Depends:
  debhelper (>= 9.0.0),
  dh-buildinfo,
- faketime,
- help2man,
+ help2man (>= 1.47.1),
  node-commander,
  node-nan,
  node-gyp,
diff --git a/debian/rules b/debian/rules
index bf05d69..da51a0f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,8 @@
 SHLIBSDIR = debian/node-ws/usr/lib/nodejs/ws/lib
 SHLIBS = bufferutil.node validation.node
 
-# reproducible documentation
-export SOURCEDATE := $(shell debian/strip-nondeterminism/dpkg-sourcedate)
-export PATH := $(CURDIR)/debian/strip-nondeterminism:$(PATH)
+# reproducible documentation, see https://wiki.debian.org/ReproducibleBuilds/TimestampsProposal
+export SOURCE_DATE_EPOCH = $(shell date -d "$$(dpkg-parsechangelog --count 1 -SDate)" +%s)
 
 %:
 	dh $@
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-javascript/node-ws.git