Hi Samuel, On Fri, Aug 19, 2016 at 08:26:05PM -0300, Samuel Henrique wrote: > Thank you very much for digging into this and providing a patch, altough > there's a little problem. > > The last part, used to get the date, returns an error "date: invalid option > -- '0'".
I just had another look at it, and I'm wondering, why the date is included at all in the VERSION? Is there a good reason for it? If not I would suggest to drop the date from the version. > If you'd like to make another patch or just point out how to fix it, i > would be glad to include it on the next revision (i'm currently doing a new > one and i'm willing to wait until this reproducibility problem is fixed to > upload). I updated the patch to use the new SOURCE_DATE_EPOCH variable and noticed another issue related to file ordering (which we didn't detect at the time this bug was submitted), which it also fixes. Kind regards, Reiner
diff --git a/debian/patches/series b/debian/patches/series index b8fe866..fd25cdb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ 06_SDLK_KP_ENTER.diff 07_nosound.diff flags.diff +sort_source_files.diff diff --git a/debian/patches/sort_source_files.diff b/debian/patches/sort_source_files.diff new file mode 100644 index 0000000..b3da855 --- /dev/null +++ b/debian/patches/sort_source_files.diff @@ -0,0 +1,14 @@ +Author: Reiner Herrmann <rei...@reiner-h.de> +Description: Sort source files to get deterministic linking order + +--- a/makefile ++++ b/makefile +@@ -51,7 +51,7 @@ + endif + + # Source and object files +-SOURCES = $(wildcard src/*.cpp) ++SOURCES = $(sort $(wildcard src/*.cpp)) + OBJS = $(SOURCES:.cpp=.o) + OBJS := $(subst src/,obj/,$(OBJS)) + diff --git a/debian/rules b/debian/rules index 25f2641..a106a27 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -DEBIAN_RULES_VERSION = \"$(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')\ $(shell date --rfc-3339=date)\" +DEBIAN_RULES_VERSION = \"$(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')\ $(shell date --rfc-3339=date -u -d @$(SOURCE_DATE_EPOCH))\" export DEB_CFLAGS_MAINT_APPEND += `sdl-config --cflags` -DVERSION=$(DEBIAN_RULES_VERSION) export DEB_LDFLAGS_MAINT_APPEND += `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU
signature.asc
Description: Digital signature
