Bug#774425: dash: diff for NMU version 0.5.8-2.2

[Niels Thykier]

Control: tags 774425 + patch
Control: tags 774425 + pending

Dear maintainer,

I've prepared an NMU for dash (versioned as 0.5.8-2.2) and
uploaded it to DELAYED/15. Please feel free to tell me if I
should delay it longer.

Regards.
diff -u dash-0.5.8/debian/changelog dash-0.5.8/debian/changelog
--- dash-0.5.8/debian/changelog
+++ dash-0.5.8/debian/changelog
@@ -1,3 +1,11 @@
+dash (0.5.8-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Apply Jérémy Bobbio's patches to make dash reproducible.
+    (Closes: #774425)
+
+ -- Niels Thykier <ni...@thykier.net>  Sat, 12 Mar 2016 09:05:01 +0000
+
 dash (0.5.8-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u dash-0.5.8/debian/implicit dash-0.5.8/debian/implicit
--- dash-0.5.8/debian/implicit
+++ dash-0.5.8/debian/implicit
@@ -35,7 +35,7 @@
            debian/$*/usr/share/doc/$*/changelog'
        @test -s debian/$*/usr/share/doc/$*/changelog || \
          sh -cx 'rm -f debian/$*/usr/share/doc/$*/changelog'
-       @gzip -9 debian/$*/usr/share/doc/$*/changelog*
+       @gzip -9n debian/$*/usr/share/doc/$*/changelog*
 %.deb-docs-docs: %.deb-docs-base
        @for i in `cat debian/$*.docs 2>/dev/null || :`; do \
          if test -d $$i; then \
@@ -57,7 +57,7 @@
        @if test -r debian/$*.NEWS.Debian; then \
          sh -cx 'install -m0644 debian/$*.NEWS.Debian \
            debian/$*/usr/share/doc/$*/NEWS.Debian && \
-             gzip -9 debian/$*/usr/share/doc/$*/NEWS.Debian'; \
+             gzip -9n debian/$*/usr/share/doc/$*/NEWS.Debian'; \
        fi
 %.deb-docs-examples: %.deb-docs-docs
        @rm -rf debian/$*/usr/share/doc/$*/examples
@@ -90,7 +90,8 @@
        : debian/$*/DEBIAN/md5sums
        @rm -f debian/$*/DEBIAN/md5sums
        @cd debian/$* && find * -path 'DEBIAN' -prune -o \
-         -type f -exec md5sum {} >>DEBIAN/md5sums \;
+         -type f -print0 | LC_ALL=C sort -z | \
+           xargs -0r md5sum >>DEBIAN/md5sums
 %.deb-DEBIAN: %.deb-checkdir %.deb-DEBIAN-base %.deb-DEBIAN-scripts \
          %.deb-DEBIAN-md5sums
        : debian/$*/DEBIAN/ ok
diff -u dash-0.5.8/debian/rules dash-0.5.8/debian/rules
--- dash-0.5.8/debian/rules
+++ dash-0.5.8/debian/rules
@@ -11,6 +11,8 @@
 CPPFLAGS =$(shell DEB_BUILD_MAINT_OPTIONS=$(DEB_BUILD_MAINT_OPTIONS) \
   dpkg-buildflags --get CPPFLAGS)
 
+BUILD_DATE := $(shell dpkg-parsechangelog | sed -n -e 's/^Date: //p')
+
 DEB_HOST_GNU_TYPE =$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE =$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
@@ -86,7 +88,7 @@
        ln -s dash '$(DIR)'/bin/sh
        install -d -m0755 '$(DIR)'/usr/share/man/man1/
        install -m0644 src/dash.1 '$(DIR)'/usr/share/man/man1/dash.1
-       gzip -9 '$(DIR)'/usr/share/man/man1/dash.1
+       gzip -9n '$(DIR)'/usr/share/man/man1/dash.1
        ln -s dash.1.gz '$(DIR)'/usr/share/man/man1/sh.1.gz
        install -d -m0755 '$(DIR)'/usr/share/menu
        install -m0644 debian/dash.menu '$(DIR)'/usr/share/menu/dash
@@ -96,12 +98,16 @@
 binary: binary-indep binary-arch
 binary-indep: install-indep ash.deb
        dpkg-gencontrol -isp -pash -P'$(DIRA)'
+       find '$(DIRA)' -depth -newermt '$(BUILD_DATE)' -print0 | \
+               xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
        dpkg -b '$(DIRA)' ..
 binary-arch: install-arch po-templates dash.deb
        # dash
        rm -f debian/substvars
        test '$(CC)' != 'gcc' || dpkg-shlibdeps '$(DIR)'/bin/dash
        dpkg-gencontrol -isp -pdash -P'$(DIR)'
+       find '$(DIR)' -depth -newermt '$(BUILD_DATE)' -print0 | \
+               xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
        dpkg -b '$(DIR)' ..
 
 .PHONY: configure build po-templates clean patch install install-indep \