Cc: Bcc: Subject: nullmailer: diff for NMU version 1:1.13-1.1 Date: Wed, 13 Jul 2016 01:17:31 +0200 X-NMUDIFF-Version: 2.16.6
Hi Michael, thanks for checking the diff. Here's a new one, which has removed mail-transport-agent.target, fixed Documentation= and uses Type=forking instead. I'm going to upload this to DELAYED/5. Best, Chris diff -Nru nullmailer-1.13/debian/changelog nullmailer-1.13/debian/changelog --- nullmailer-1.13/debian/changelog 2014-08-08 02:19:32.000000000 +0200 +++ nullmailer-1.13/debian/changelog 2016-07-13 01:15:52.000000000 +0200 @@ -1,3 +1,17 @@ +nullmailer (1:1.13-1.1) unstable; urgency=medium + + * Non-maintainer upload. + + [ Alexis Bienvenüe ] + * Deterministic file order in archives. (Closes: #820661) + + [ Christian Hofstaedtler ] + * Bump Standards-Version to 3.9.8. + * Add native systemd units, based on initial patch supplied + by Viktar Vauchkevich. (Closes: #760041) + + -- Christian Hofstaedtler <z...@debian.org> Wed, 13 Jul 2016 01:15:46 +0200 + nullmailer (1:1.13-1) unstable; urgency=low * Ack NMU, thankyou for your help with this package. diff -Nru nullmailer-1.13/debian/control nullmailer-1.13/debian/control --- nullmailer-1.13/debian/control 2014-08-06 22:42:09.000000000 +0200 +++ nullmailer-1.13/debian/control 2016-07-13 01:11:38.000000000 +0200 @@ -2,14 +2,21 @@ Section: mail Priority: extra Maintainer: Nick Leverton <n...@leverton.org> -Build-Depends: debhelper (>= 9), po-debconf, automake, autoconf, - dh-autoreconf, libgnutls28-dev | libgnutls-dev -Standards-Version: 3.9.5 +Build-Depends: autoconf, + automake, + debhelper (>= 9), + dh-autoreconf, + dh-systemd, + libgnutls28-dev | libgnutls-dev, + po-debconf +Standards-Version: 3.9.8 Homepage: http://untroubled.org/nullmailer/ Package: nullmailer Architecture: any -Depends: lsb-base, ${misc:Depends}, ${shlibs:Depends} +Depends: lsb-base, + ${misc:Depends}, + ${shlibs:Depends} Recommends: rsyslog | system-log-daemon Conflicts: mail-transport-agent Provides: mail-transport-agent diff -Nru nullmailer-1.13/debian/links nullmailer-1.13/debian/links --- nullmailer-1.13/debian/links 2011-03-01 22:23:44.000000000 +0100 +++ nullmailer-1.13/debian/links 2016-07-02 15:33:53.000000000 +0200 @@ -1,9 +1,9 @@ bin/true usr/bin/newaliases usr/sbin/sendmail usr/lib/sendmail -usr/share/man/man7/nullmailer.7.gz usr/share/man/man1/mailq.1.gz -usr/share/man/man8/nullmailer-queue.8.gz usr/share/man/man5/adminaddr.5.gz usr/share/man/man1/nullmailer-inject.1.gz usr/share/man/man5/defaultdomain.5.gz usr/share/man/man1/nullmailer-inject.1.gz usr/share/man/man5/defaulthost.5.gz usr/share/man/man1/nullmailer-inject.1.gz usr/share/man/man5/idhost.5.gz +usr/share/man/man7/nullmailer.7.gz usr/share/man/man1/mailq.1.gz +usr/share/man/man8/nullmailer-queue.8.gz usr/share/man/man5/adminaddr.5.gz usr/share/man/man8/nullmailer-send.8.gz usr/share/man/man5/pausetime.5.gz usr/share/man/man8/nullmailer-send.8.gz usr/share/man/man5/remotes.5.gz diff -Nru nullmailer-1.13/debian/manpages nullmailer-1.13/debian/manpages --- nullmailer-1.13/debian/manpages 2012-05-16 21:45:16.000000000 +0200 +++ nullmailer-1.13/debian/manpages 2016-07-02 15:33:53.000000000 +0200 @@ -1,2 +1,2 @@ -doc/sendmail.1 debian/man/* +doc/sendmail.1 diff -Nru nullmailer-1.13/debian/nullmailer.service nullmailer-1.13/debian/nullmailer.service --- nullmailer-1.13/debian/nullmailer.service 1970-01-01 01:00:00.000000000 +0100 +++ nullmailer-1.13/debian/nullmailer.service 2016-07-13 01:06:08.000000000 +0200 @@ -0,0 +1,11 @@ +[Unit] +Description=Mail Transport Agent +Documentation=man:nullmailer(7) + +[Service] +Type=forking +ExecStart=/usr/sbin/nullmailer-send --daemon +User=mail + +[Install] +WantedBy=multi-user.target diff -Nru nullmailer-1.13/debian/patches/15_sort_files_in_archive.diff nullmailer-1.13/debian/patches/15_sort_files_in_archive.diff --- nullmailer-1.13/debian/patches/15_sort_files_in_archive.diff 1970-01-01 01:00:00.000000000 +0100 +++ nullmailer-1.13/debian/patches/15_sort_files_in_archive.diff 2016-07-02 15:32:32.000000000 +0200 @@ -0,0 +1,16 @@ +Description: Sort files in archive + Sort files when using mergelib to create libnullmailer.a, to get + reproducible build +Author: Alexis Bienvenüe <p...@passoire.fr> + +Index: nullmailer-1.13/lib/mergelib.sh +=================================================================== +--- nullmailer-1.13.orig/lib/mergelib.sh ++++ nullmailer-1.13/lib/mergelib.sh +@@ -12,5 +12,5 @@ for input in "$@"; do + ar x ../../"$input" + cd .. + done +-ar rc ../"$archive" */* ++ar rc ../"$archive" `LC_ALL=C ls */*` + ranlib ../"$archive" diff -Nru nullmailer-1.13/debian/patches/series nullmailer-1.13/debian/patches/series --- nullmailer-1.13/debian/patches/series 2014-08-07 10:01:55.000000000 +0200 +++ nullmailer-1.13/debian/patches/series 2016-07-02 15:32:32.000000000 +0200 @@ -8,3 +8,4 @@ 12_allow_no_dots.diff 13_fix_automake.diff 14_more_manpages.diff +15_sort_files_in_archive.diff diff -Nru nullmailer-1.13/debian/rules nullmailer-1.13/debian/rules --- nullmailer-1.13/debian/rules 2014-08-07 10:13:12.000000000 +0200 +++ nullmailer-1.13/debian/rules 2016-07-13 01:09:32.000000000 +0200 @@ -13,7 +13,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh $@ --with autoreconf + dh $@ --with autoreconf --with systemd override_dh_prep: dh_prep diff -Nru nullmailer-1.13/debian/tmpfile nullmailer-1.13/debian/tmpfile --- nullmailer-1.13/debian/tmpfile 1970-01-01 01:00:00.000000000 +0100 +++ nullmailer-1.13/debian/tmpfile 2016-07-02 15:32:25.000000000 +0200 @@ -0,0 +1 @@ +p /var/spool/nullmailer/trigger 622 mail root
