use --mtime='2015-10-21 00:00Z'

as per https://reproducible-builds.org/docs/archives/

no longer use find / touch as no longer needed

use strip-nondeterminism on upstream and debian archive

usr/share/genmkfile/make-helper.bsh

@@ -593,8 +593,7 @@ make_dist() {
 
    pushd "$temp_folder/$make_upstream_tarball_source_folder_name"
 
-   ## Required to make deterministic.
-   find "." -not -iwholename '*.git*' -exec touch --no-dereference --date="Wed Sep 30 16:30:05 UTC 2015" {} +
+   #find "." -not -iwholename '*.git*' -exec touch --no-dereference --date="Wed Sep 30 16:30:05 UTC 2015" {} +
 
    ## No longer using --transform because that does not work with symlinks.
    ## (Important for 'corridor' package.)
@@ -611,6 +610,7 @@ make_dist() {
             --owner=root --group=root --numeric-owner \
             --mode=go=rX,u+rw,a-s \
             --sort=name \
+            --mtime='2015-10-21 00:00Z' \
             -T \
             - \
                | gzip -9 -n > "$make_upstream_tarball_real_path"
@@ -619,15 +619,16 @@ make_dist() {
 
    rm --recursive --force "$temp_folder"
 
+   strip-nondeterminism "$make_upstream_tarball_real_path"
+
    test -f "$make_upstream_tarball_real_path"
    test -f "$make_upstream_tarball_relative_path"
 }
 
 make_debdist() {
    make_function_run make_undebdist
 
-   ## Required to make deterministic.
-   find "." -not -iwholename '*.git*' -exec touch --no-dereference --date="Wed Sep 30 16:30:05 UTC 2015" {} +
+   #find "." -not -iwholename '*.git*' -exec touch --no-dereference --date="Wed Sep 30 16:30:05 UTC 2015" {} +
 
    ## Not using `dpkg-source` since that does not support any other output dir than '../'.
 
@@ -642,11 +643,14 @@ make_debdist() {
             --owner=root --group=root --numeric-owner \
             --mode=go=rX,u+rw,a-s \
             --sort=name \
+            --mtime='2015-10-21 00:00Z' \
             --xz \
             --file="$make_debian_tarball_absolute_path" \
             -T \
             -
 
+   strip-nondeterminism "$make_debian_tarball_absolute_path"
+
    test -f "$make_debian_tarball_absolute_path"
 }