diff -Nru mblaze-0.3.2/debian/changelog mblaze-0.3.2/debian/changelog --- mblaze-0.3.2/debian/changelog 2018-02-13 18:37:14.000000000 +0000 +++ mblaze-0.3.2/debian/changelog 2018-05-09 20:02:18.000000000 +0000 @@ -1,3 +1,15 @@ +mblaze (0.3.2-2) unstable; urgency=low + + * Apply reproducible build patch (Closes: 890551) + * Move the packaging repository to salsa.d.o + * Declare compliance with policy v4.1.4. + No change needed. + * debian/rules + - Drop unnecessary --parallel dh argument + - Remove a superfluous use of dh-exec + + -- Nicolas Braud-Santoni Wed, 09 May 2018 22:02:18 +0200 + mblaze (0.3.2-1) unstable; urgency=high * New upstream version (2018-02-13) @@ -48,4 +60,3 @@ * Initial packaging (Closes: 882788) -- Nicolas Braud-Santoni Mon, 30 Oct 2017 18:29:10 +0100 - diff -Nru mblaze-0.3.2/debian/control mblaze-0.3.2/debian/control --- mblaze-0.3.2/debian/control 2018-02-13 11:47:54.000000000 +0000 +++ mblaze-0.3.2/debian/control 2018-05-09 20:02:18.000000000 +0000 @@ -2,11 +2,11 @@ Maintainer: Nicolas Braud-Santoni Section: utils Priority: optional -Build-Depends: debhelper (>= 11), dh-exec -Standards-Version: 4.1.3 +Build-Depends: debhelper (>= 11) +Standards-Version: 4.1.4 Homepage: https://github.com/chneukirchen/mblaze -Vcs-Browser: https://anonscm.debian.org/git/collab-maint/mblaze.git/ -Vcs-Git: https://anonscm.debian.org/git/collab-maint/mblaze.git +Vcs-Browser: https://salsa.debian.org/debian/mblaze +Vcs-Git: https://salsa.debian.org/debian/mblaze.git Package: mblaze Architecture: any diff -Nru mblaze-0.3.2/debian/mblaze.install mblaze-0.3.2/debian/mblaze.install --- mblaze-0.3.2/debian/mblaze.install 2018-02-13 11:47:54.000000000 +0000 +++ mblaze-0.3.2/debian/mblaze.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -#!/usr/bin/dh-exec -NEWS.md => /usr/share/doc/mblaze/changelog \ No newline at end of file diff -Nru mblaze-0.3.2/debian/patches/reproducible-build.patch mblaze-0.3.2/debian/patches/reproducible-build.patch --- mblaze-0.3.2/debian/patches/reproducible-build.patch 1970-01-01 00:00:00.000000000 +0000 +++ mblaze-0.3.2/debian/patches/reproducible-build.patch 2018-05-09 20:02:18.000000000 +0000 @@ -0,0 +1,29 @@ +Description: Make the build reproducible +Bug: 890551 +Forwarded: https://github.com/chneukirchen/mblaze/pull/115 +Author: Chris Lamb +Reviewed-by: Nicolas Braud-Santoni +Last-Update: 2018-02-18 +Applied-Upstream: no + +--- mblaze-0.3.2.orig/GNUmakefile ++++ mblaze-0.3.2/GNUmakefile +@@ -37,10 +37,17 @@ msort : mystrverscmp.o + mmime : slurp.o + minc mlist : squeeze_slash.o + ++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 ++ + museragent: FRC + @printf '#!/bin/sh\nprintf "User-Agent: mblaze/%s (%s)\\n"\n' \ + "$$({ git describe --always --dirty 2>/dev/null || cat VERSION; } | sed 's/^v//')" \ +- "$$(date +%Y-%m-%d)" >$@ ++ "$(BUILD_DATE)" >$@ + @chmod +x $@ + + README: man/mblaze.7 diff -Nru mblaze-0.3.2/debian/patches/series mblaze-0.3.2/debian/patches/series --- mblaze-0.3.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ mblaze-0.3.2/debian/patches/series 2018-05-09 20:02:18.000000000 +0000 @@ -0,0 +1 @@ +reproducible-build.patch diff -Nru mblaze-0.3.2/debian/rules mblaze-0.3.2/debian/rules --- mblaze-0.3.2/debian/rules 2018-02-13 11:47:54.000000000 +0000 +++ mblaze-0.3.2/debian/rules 2018-05-09 20:02:18.000000000 +0000 @@ -3,10 +3,13 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh $@ --parallel + dh $@ override_dh_auto_install: dh_auto_install -- PREFIX=/usr override_dh_auto_test: : # Testsuite is currently broken under sbuild + +override_dh_installchangelogs: + dh_installchangelogs NEWS.md