[Pkg-privacy-commits] [tor-monitor] 03/05: make reproducible without the need for faketime

[Sascha Steinbiss]

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

sascha-guest pushed a commit to branch master
in repository tor-monitor.

commit 9ad9bb1be3d6c2b6e0d166a89143cffbfbce963d
Author: Sascha Steinbiss <sascha at steinbiss.name>
Date:   Tue Dec 29 11:27:01 2015 +0000

    make reproducible without the need for faketime
---
 debian/rules | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/debian/rules b/debian/rules
index 212df60..dea3df0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,20 @@
 #! /usr/bin/make -f
 
-#export DH_VERBOSE = 1
 export PYBUILD_NAME=tor-monitor
-
-# Use faketime for now until we have SOURCE_DATE_EPOCH for gettext
-ifeq ($(shell faketime 'last friday' date > /dev/null 2> /dev/null; echo $$?),0)
-  FAKETIME:=faketime "`dpkg-parsechangelog -S date`"
-endif
+export UPSTREAM_VERSION=$(shell dpkg-parsechangelog -SVersion | cut -d- -f1)
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_auto_install:
-	$(FAKETIME) python3 setup.py install --root=debian/tor-monitor --install-layout=deb
+	python3 setup.py install --root=debian/tor-monitor --install-layout=deb
 
 override_dh_installman:
-	$(FAKETIME) help2man -S 'Tails project' -n 'display Tor circuits and streams' \
-          -N $(CURDIR)/tormonitor | sed 's/.Errno/tormonitor/g' | sed 's/.ERRNO/TORMONITOR/g '> debian/tormonitor.1
+	# help2man now uses SOURCE_DATE_EPOCH
+	help2man -S 'Tails project' \
+	      -n 'display Tor circuits and streams' \
+          -N --version-string="$(UPSTREAM_VERSION)" \
+          $(CURDIR)/tormonitor > debian/tormonitor.1
 	dh_installman
 
 override_dh_auto_clean:

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