Control: tag -1 + patch Hi,
Please see attached patches for both neomutt and mutt to implement this. Review welcome. If you lack time, I'm happy to help out with a NMU. If so please just say, so we can skip the waiting. Note for mutt: I did not revert the previous commit[1] that ripped out alternatives, for the following reasons: - the debian/changelog entry should not be reverted - the old alternatives where for different files - given we divert different files now, we likely still want to keep the prerm remove-all call until upgrading from 1.6 is considered unsupported (which I leave up to you to determine when that is). Also, as noted in the top comment of the mutt debdiff the lintian override for desktop file should most likely be reintroduced again. Note for neomutt maintainers: This might also be a good time to get #894688 fixed. And the patch also as a bonus could probably be considered to fix #888260 which you might want to close. CCing people who showed interest on the bug report. Help with (additional) testing would be welcome. Regards, Andreas Henriksson [1]: https://salsa.debian.org/mutt-team/mutt/commit/fd1a5ea0e9653473632af8ef8ae3bcc87c8b3161
diff -Nru mutt-1.10.1/debian/changelog mutt-1.10.1/debian/changelog --- mutt-1.10.1/debian/changelog 2018-08-07 10:31:52.000000000 +0200 +++ mutt-1.10.1/debian/changelog 2018-09-28 09:19:02.000000000 +0200 @@ -1,3 +1,11 @@ +mutt (1.10.1-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Make /usr/bin/mutt , /usr/bin/mutt_dotlock , /usr/bin/smime_keys plus + manpages an alternative that can be provided by others. (See #882715) + + -- Andreas Henriksson <[email protected]> Fri, 28 Sep 2018 09:19:02 +0200 + mutt (1.10.1-2) unstable; urgency=low [ Jonathan Nieder ] diff -Nru mutt-1.10.1/debian/mutt.install mutt-1.10.1/debian/mutt.install --- mutt-1.10.1/debian/mutt.install 2018-04-15 10:11:26.000000000 +0200 +++ mutt-1.10.1/debian/mutt.install 2018-09-28 09:19:02.000000000 +0200 @@ -1,6 +1,6 @@ -debian/tmp/usr/bin/mutt -debian/tmp/usr/bin/smime_keys -debian/tmp/usr/bin/mutt_dotlock +debian/tmp/usr/bin/original-mutt +debian/tmp/usr/bin/original-smime_keys +debian/tmp/usr/bin/original-mutt_dotlock debian/tmp/usr/share/locale/* debian/extra/lib/mailspell usr/lib/mutt diff -Nru mutt-1.10.1/debian/mutt.manpages mutt-1.10.1/debian/mutt.manpages --- mutt-1.10.1/debian/mutt.manpages 2018-04-15 10:11:26.000000000 +0200 +++ mutt-1.10.1/debian/mutt.manpages 2018-09-28 09:19:02.000000000 +0200 @@ -1,6 +1,6 @@ -debian/tmp/usr/share/man/man1/mutt.1 -debian/tmp/usr/share/man/man1/mutt_dotlock.1 -debian/tmp/usr/share/man/man5/muttrc.5 -debian/tmp/usr/share/man/man1/smime_keys.1 -debian/tmp/usr/share/man/man5/mbox.5 -debian/tmp/usr/share/man/man5/mmdf.5 +debian/tmp/usr/share/man/man1/original-mutt.1 +debian/tmp/usr/share/man/man1/original-mutt_dotlock.1 +debian/tmp/usr/share/man/man5/original-muttrc.5 +debian/tmp/usr/share/man/man1/original-smime_keys.1 +debian/tmp/usr/share/man/man5/original-mbox.5 +debian/tmp/usr/share/man/man5/original-mmdf.5 diff -Nru mutt-1.10.1/debian/mutt.postinst mutt-1.10.1/debian/mutt.postinst --- mutt-1.10.1/debian/mutt.postinst 1970-01-01 01:00:00.000000000 +0100 +++ mutt-1.10.1/debian/mutt.postinst 2018-09-28 09:19:02.000000000 +0200 @@ -0,0 +1,36 @@ +#!/bin/sh +set -e + +if [ "$1" = "configure" ]; then + +update-alternatives --install /usr/bin/mutt mutt /usr/bin/original-mutt 1000 \ + --slave \ + /usr/share/man/man1/mutt.1.gz mutt.1.gz \ + /usr/share/man/man1/original-mutt.1.gz \ + --slave \ + /usr/share/man/man5/muttrc.5.gz muttrc.5.gz \ + /usr/share/man/man5/original-muttrc.5.gz \ + --slave \ + /usr/share/man/man5/mbox.5.gz mbox.5.gz \ + /usr/share/man/man5/original-mbox.5.gz \ + --slave \ + /usr/share/man/man5/mmdf.5.gz mmdf.5.gz \ + /usr/share/man/man5/original-mmdf.5.gz + +update-alternatives --install /usr/bin/mutt_dotlock mutt_dotlock \ + /usr/bin/original-mutt_dotlock 1000 \ + --slave \ + /usr/share/man/man1/mutt_dotlock.1.gz \ + mutt_dotlock.1.gz \ + /usr/share/man/man1/original-mutt_dotlock.1.gz \ + +update-alternatives --install /usr/bin/smime_keys smime_keys \ + /usr/bin/original-smime_keys 1000 \ + --slave \ + /usr/share/man/man1/smime_keys.1.gz \ + smime_keys.1.gz \ + /usr/share/man/man1/original-smime_keys.1.gz \ + +fi + +#DEBHELPER# diff -Nru mutt-1.10.1/debian/mutt.prerm mutt-1.10.1/debian/mutt.prerm --- mutt-1.10.1/debian/mutt.prerm 1970-01-01 01:00:00.000000000 +0100 +++ mutt-1.10.1/debian/mutt.prerm 2018-09-28 09:19:02.000000000 +0200 @@ -0,0 +1,15 @@ +#!/bin/sh +set -e + +case "$1" in + remove|configure) + update-alternatives --remove mutt \ + /usr/bin/original-mutt + update-alternatives --remove mutt_dotlock \ + /usr/bin/original-mutt_dotlock + update-alternatives --remove smime_keys \ + /usr/bin/original-smime_keys + ;; +esac + +#DEBHELPER# diff -Nru mutt-1.10.1/debian/rules mutt-1.10.1/debian/rules --- mutt-1.10.1/debian/rules 2018-04-19 08:05:48.000000000 +0200 +++ mutt-1.10.1/debian/rules 2018-09-28 09:19:02.000000000 +0200 @@ -40,6 +40,26 @@ dh_auto_install --destdir=debian/tmp override_dh_install: + # Rename things with origin-* to allow for alternatives + # see debian/mutt.{postinst,prerm} for alternatives link install. + mv debian/tmp/usr/bin/mutt debian/tmp/usr/bin/original-mutt + mv debian/tmp/usr/bin/mutt_dotlock \ + debian/tmp/usr/bin/original-mutt_dotlock + mv debian/tmp/usr/bin/smime_keys \ + debian/tmp/usr/bin/original-smime_keys + mv debian/tmp/usr/share/man/man1/mutt.1 \ + debian/tmp/usr/share/man/man1/original-mutt.1 + mv debian/tmp/usr/share/man/man1/mutt_dotlock.1 \ + debian/tmp/usr/share/man/man1/original-mutt_dotlock.1 + mv debian/tmp/usr/share/man/man5/muttrc.5 \ + debian/tmp/usr/share/man/man5/original-muttrc.5 + mv debian/tmp/usr/share/man/man1/smime_keys.1 \ + debian/tmp/usr/share/man/man1/original-smime_keys.1 + mv debian/tmp/usr/share/man/man5/mbox.5 \ + debian/tmp/usr/share/man/man5/original-mbox.5 + mv debian/tmp/usr/share/man/man5/mmdf.5 \ + debian/tmp/usr/share/man/man5/original-mmdf.5 + cd debian/tmp/usr/share/doc/mutt && \ rm -rf samples/iconv samples/ca-bundle.crt && \ cp $(CURDIR)/UPDATING NEWS
diff -Nru neomutt-20180716+dfsg.1/debian/changelog neomutt-20180716+dfsg.1/debian/changelog --- neomutt-20180716+dfsg.1/debian/changelog 2018-07-18 23:15:56.000000000 +0200 +++ neomutt-20180716+dfsg.1/debian/changelog 2018-09-28 10:40:14.000000000 +0200 @@ -1,3 +1,13 @@ +neomutt (20180716+dfsg.1-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Add Conflicts against older mutt versions which did not use + the alternatives system. + * Provide /usr/bin/mutt and /usr/bin/smime_keys alternative. + (Closes: #882715) + + -- Andreas Henriksson <[email protected]> Fri, 28 Sep 2018 10:40:14 +0200 + neomutt (20180716+dfsg.1-1) unstable; urgency=medium * New upstream release. diff -Nru neomutt-20180716+dfsg.1/debian/control neomutt-20180716+dfsg.1/debian/control --- neomutt-20180716+dfsg.1/debian/control 2018-03-04 19:36:08.000000000 +0100 +++ neomutt-20180716+dfsg.1/debian/control 2018-09-28 10:40:14.000000000 +0200 @@ -36,6 +36,7 @@ Recommends: locales, mime-support, libsasl2-modules Suggests: default-mta | mail-transport-agent, urlview, aspell | ispell, gnupg, mixmaster, openssl, ca-certificates Provides: mail-reader, imap-client +Conflicts: mutt (<< 1.10.1-2.1~) Description: command line mail reader based on Mutt, with added features Neomutt supports all the features that are supported by Mutt, including POP and IMAP support, SSL encryption and SASL authentication, threading and GPG diff -Nru neomutt-20180716+dfsg.1/debian/neomutt.postinst neomutt-20180716+dfsg.1/debian/neomutt.postinst --- neomutt-20180716+dfsg.1/debian/neomutt.postinst 1970-01-01 01:00:00.000000000 +0100 +++ neomutt-20180716+dfsg.1/debian/neomutt.postinst 2018-09-28 10:40:14.000000000 +0200 @@ -0,0 +1,26 @@ +#!/bin/sh +set -e + +update-alternatives --install /usr/bin/mutt mutt /usr/bin/neomutt 500 \ + --slave \ + /usr/share/man/man1/mutt.1.gz mutt.1.gz \ + /usr/share/man/man1/neomutt.1.gz \ + --slave \ + /usr/share/man/man5/mbox.5.gz mbox.5.gz \ + /usr/share/man/man5/mbox_neomutt.5.gz \ + --slave \ + /usr/share/man/man5/mmdf.5.gz mmdf.5.gz \ + /usr/share/man/man5/mmdf_neomutt.5.gz \ + --slave \ + /usr/share/man/man5/muttrc.5.gz muttrc.5.gz \ + /usr/share/man/man5/neomuttrc.5.gz + +update-alternatives --install /usr/bin/smime_keys smime_keys \ + /usr/lib/neomutt/smime_keys 500 \ + --slave \ + /usr/share/man/man1/smime_keys.1.gz smime_keys.1.gz \ + /usr/share/man/man1/smime_keys_neomutt.1.gz + +# No alternative for mutt_dotlock which doesn't seem to be available in neomutt + +#DEBHELPER# diff -Nru neomutt-20180716+dfsg.1/debian/neomutt.prerm neomutt-20180716+dfsg.1/debian/neomutt.prerm --- neomutt-20180716+dfsg.1/debian/neomutt.prerm 1970-01-01 01:00:00.000000000 +0100 +++ neomutt-20180716+dfsg.1/debian/neomutt.prerm 2018-09-28 10:40:14.000000000 +0200 @@ -0,0 +1,7 @@ +#!/bin/sh +set -e + +update-alternatives --remove mutt /usr/bin/mutt +update-alternatives --remove smime_keys /usr/lib/neomutt/smime_keys + +#DEBHELPER#
