diff options
| author | Christoph Egger <christoph@debian.org> | 2017-10-01 16:46:18 +0200 |
|---|---|---|
| committer | Christoph Egger <christoph@debian.org> | 2017-10-01 16:46:18 +0200 |
| commit | acdbd5ebc9286fab7223afff23cc4a23723a2be6 (patch) | |
| tree | ca4716c62b95f6ed5e6b6e9b699b3e4495d08a83 /debian | |
| parent | 8981dcbebba8fd47d3535e98db823c4a4d7c3452 (diff) | |
Import patch by Fabian Wolff to make build reproducible (Closes: #823961)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/reproducible.diff | 49 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 57 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 6dc3a627..27fb729a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +herbstluftwm (0.7.0-2) UNRELEASED; urgency=medium + + * Import patch by Fabian Wolff to make build reproducible (Closes: + #823961) + + -- Christoph Egger <christoph@debian.org> Sun, 01 Oct 2017 16:45:58 +0200 + herbstluftwm (0.7.0-1) unstable; urgency=medium * New upstream release diff --git a/debian/patches/reproducible.diff b/debian/patches/reproducible.diff new file mode 100644 index 00000000..ed0d34e2 --- /dev/null +++ b/debian/patches/reproducible.diff @@ -0,0 +1,49 @@ +--- a/Makefile ++++ b/Makefile +@@ -18,6 +18,15 @@ + HERBSTLUFTWMDOC = doc/herbstluftwm.txt + TUTORIAL = doc/herbstluftwm-tutorial.txt + ++DATE_FMT = %Y-%m-%d ++ifdef SOURCE_DATE_EPOCH ++ BUILD_DATE ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)" 2>/dev/null || date -u "+$(DATE_FMT)") ++else ++ BUILD_DATE ?= $(shell date "+$(DATE_FMT)") ++endif ++ ++export CPPFLAGS += -DBUILD_DATE="\"$(BUILD_DATE)\"" ++ + .PHONY: depend all all-nodoc doc install install-nodoc info www + .PHONY: cleandoc cleanwww cleandeps clean + +@@ -93,7 +102,7 @@ + + doc/%.1 doc/%.7: doc/%.txt version.mk + $(call colorecho,DOC,$@) +- $(VERBOSE) $(A2X) -f manpage -a "herbstluftwmversion=herbstluftwm $(VERSION)" -a "date=`date +%Y-%m-%d`" $< ++ $(VERBOSE) $(A2X) -f manpage -a "herbstluftwmversion=herbstluftwm $(VERSION)" -a "date=$(BUILD_DATE)" $< + + doc/%.html: doc/%.txt version.mk + $(call colorecho,DOC,$@) +--- a/ipc-client/main.c ++++ b/ipc-client/main.c +@@ -17,7 +17,7 @@ + #include "client-utils.h" + + #define HERBSTCLIENT_VERSION_STRING \ +- "herbstclient " HERBSTLUFT_VERSION " (built on " __DATE__ ")\n" ++ "herbstclient " HERBSTLUFT_VERSION " (built on " BUILD_DATE ")\n" + + void print_help(char* command, FILE* file); + void init_hook_regex(int argc, char* argv[]); +--- a/src/globals.h ++++ b/src/globals.h +@@ -12,7 +12,7 @@ + #define HERBSTLUFT_AUTOSTART "herbstluftwm/autostart" + #define WINDOW_MANAGER_NAME "herbstluftwm" + #define HERBSTLUFT_VERSION_STRING \ +- WINDOW_MANAGER_NAME " " HERBSTLUFT_VERSION " (built on " __DATE__ ")" ++ WINDOW_MANAGER_NAME " " HERBSTLUFT_VERSION " (built on " BUILD_DATE ")" + + #define HERBST_FRAME_CLASS "_HERBST_FRAME" + #define HERBST_DECORATION_CLASS "_HERBST_DECORATION" diff --git a/debian/patches/series b/debian/patches/series index e69de29b..7418fb23 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +reproducible.diff |