[Pkg-samba-maint] [samba] 03/11: Remove "ugly workaround to get the manpages on every architecture to be identical", xsltproc now honour SOURCE_DATE_EPOCH

[Mathieu Parent]

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

sathieu pushed a commit to branch master
in repository samba.

commit ee0f37844c4bc1dc7a3707854c5c21510f39e95b
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Wed Jun 28 10:12:11 2017 +0200

    Remove "ugly workaround to get the manpages on every architecture to be identical", xsltproc now honour SOURCE_DATE_EPOCH
    
    Since xsltproc 1.1.28-3 (see #791815)
---
 debian/bin/xsltproc             | 19 -------------------
 debian/get_source_changedate.pl | 21 ---------------------
 debian/rules                    |  3 +--
 3 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/debian/bin/xsltproc b/debian/bin/xsltproc
deleted file mode 100755
index 0e8b099..0000000
--- a/debian/bin/xsltproc
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh
-
-# This is an ugly workaround to get the manpages on every architecture to be
-# identical. This hack forces the date in all of the builds to be the date of
-# the latest source change in the changelog.
-# see http://bugs.debian.org/726314
-
-export TZ=UTC
-
-FAKETIMEPROG=`which faketime`
-
-if [ -x "$FAKETIMEPROG" -a -n "$SOURCE_DATE" ]
-then
-	$FAKETIMEPROG "$SOURCE_DATE" /usr/bin/xsltproc "$@"
-else
-	/usr/bin/xsltproc "$@"
-fi
-
-
diff --git a/debian/get_source_changedate.pl b/debian/get_source_changedate.pl
deleted file mode 100755
index 72b24c8..0000000
--- a/debian/get_source_changedate.pl
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /usr/bin/perl
-
-use strict;
-use Dpkg::Changelog::Parse;
-use Data::Dumper;
-
-my %opts = ("file" => 'debian/changelog');
-
-# get last changelog entry
-my $entry = changelog_parse(%opts);
-
-# if binnmu: get previous entry, which is the source entry
-if ($entry->{"Binary-Only"}) {
-	$opts{"count"} = 1;
-	$opts{"offset"} = 1;
-	$entry = changelog_parse(%opts);
-}
-
-# get the last change date for the source entry
-my $source_date = $entry->{"Date"};
-print "$source_date\n";
diff --git a/debian/rules b/debian/rules
index 7758255..ad419be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,9 +29,8 @@ WAF = $(PYTHON) ./buildtools/bin/waf -v
 d_b_o:=$(shell echo "$$DEB_BUILD_OPTIONS"|sed 's/[^-[:alnum:]]/ /g'|tr a-z A-Z)
 $(foreach o, $(d_b_o), $(eval DEB_BUILD_OPT_$o := 1))
 
-# for xsltproc wrapper
+# wrapper around cups-config, to work around #726726
 export PATH:=$(CURDIR)/debian/bin:$(PATH)
-export SOURCE_DATE=$(shell debian/get_source_changedate.pl)
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 WAF += -j $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))

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