[Pkg-octave-commit] [octave-pkg-dev] 01/04: Prevent timestamp in generated doc-cache files
Rafael Laboissière
rlaboiss-guest at moszumanska.debian.org
Sun Feb 15 22:04:45 UTC 2015
This is an automated email from the git hooks/post-receive script.
rlaboiss-guest pushed a commit to branch master
in repository octave-pkg-dev.
commit 8b2472c8143a604ee2715a99802a346b03519e7d
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date: Sun Feb 15 15:58:59 2015 -0200
Prevent timestamp in generated doc-cache files
This commit reverts my previous change and applies the patch proposed
by Chris West in Bug#778458, which is a much more elegant solution for
preventing timestamps being included in doc-cache files.
Thanks: Chris West for the patch
Closes: #778458
---
octave-pkg.mk | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/octave-pkg.mk b/octave-pkg.mk
index 2eac8ab..bc83142 100644
--- a/octave-pkg.mk
+++ b/octave-pkg.mk
@@ -69,7 +69,6 @@ install/$(package):: \
clean-files \
install-docs \
check-pkg \
- fix-doc-cache \
remove-dirs
.PHONY: check-version
@@ -100,6 +99,8 @@ install-pkg:
[pwd(),'/$(debpkg)/$(bpath)']); \
pkg ('local_list', [pwd(),'/$(local_list)']); \
pkg ('global_list', [pwd(),'/$(global_list)']); \
+ save_header_format_string( \
+ '# Generated by Octave during Debian package build'); \
if (exist ('PKG_ADD.bak') == 2), \
movefile ('PKG_ADD.bak', 'PKG_ADD'); \
endif; \
@@ -177,21 +178,6 @@ else
check-pkg:
endif
-
-# Replace the time stamp and email address in the doc-cache files by
-# the information present in the last entry of debian/changelog, such
-# that the package build is reproducible
-# (see https://reproducible.debian.net/reproducible.html).
-
-maintainer_email = $(shell dpkg-parsechangelog | grep ^Maintainer: | sed 's/^Maintainer: //' | sed 's/^[^<]\+ //')
-changelog_date = $(shell dpkg-parsechangelog | grep ^Date: | sed 's/^Date: //;s/,//')
-
-.PHONY: fix-doc-cache
-fix-doc-cache:
- for i in $$(find debian/ -name doc-cache) ; do \
- sed -i -e 's/^\(# Created by Octave [0-9.]\+,\).*/\1 $(changelog_date) $(maintainer_email)/' $$i ; \
- done
-
.PHONY: remove-dirs
remove-dirs:
rmdir --ignore-fail-on-non-empty -p \
--
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-pkg-dev.git
More information about the Pkg-octave-commit
mailing list