sync with upstream

[Karel Zak]

I have merged (cherry-picked) ~40 patches from mutt upstream hg
 repository.

Please, try update and test. Thanks.

Karel

[Suvayu Ali]

Hi,

On Mon, Feb 09, 2015 at 02:25:28PM +0100, Karel Zak wrote:
> I have merged (cherry-picked) ~40 patches from mutt upstream hg
>  repository.
>
> Please, try update and test. Thanks.

You can find the corresponding build for Fedora here:

https://copr-fe.cloud.fedoraproject.org/coprs/fatka/mutt-kz/build/71151/

Happy testing,

[Suvayu Ali]

On Mon, Feb 09, 2015 at 11:42:07PM +0100, Suvayu Ali wrote:
> Hi,
>
> On Mon, Feb 09, 2015 at 02:25:28PM +0100, Karel Zak wrote:
> > I have merged (cherry-picked) ~40 patches from mutt upstream hg
> >  repository.
> >
> > Please, try update and test. Thanks.
>
> You can find the corresponding build for Fedora here:
>
> https://copr-fe.cloud.fedoraproject.org/coprs/fatka/mutt-kz/build/71151/
>
> Happy testing,

Hmm ... looks like something is wrong with copr, the produced RPMs and
the logs seem completely borked!

[Suvayu Ali]

On Tue, Feb 10, 2015 at 12:00:32AM +0100, Suvayu Ali wrote:
> On Mon, Feb 09, 2015 at 11:42:07PM +0100, Suvayu Ali wrote:
> > Hi,
> >
> > On Mon, Feb 09, 2015 at 02:25:28PM +0100, Karel Zak wrote:
> > > I have merged (cherry-picked) ~40 patches from mutt upstream hg
> > >  repository.
> > >
> > > Please, try update and test. Thanks.
> >
> > You can find the corresponding build for Fedora here:
> >
> > https://copr-fe.cloud.fedoraproject.org/coprs/fatka/mutt-kz/build/71151/
> >
> > Happy testing,
>
> Hmm ... looks like something is wrong with copr, the produced RPMs and
> the logs seem completely borked!

Okay, they seem to be fine now.  The build was fine, but repo creation
had failed.  Happy testing :).

Cheers,

[Víctor M. Jáquez L.]

On 02/09/15 at 02:25pm, Karel Zak wrote:
> I have merged (cherry-picked) ~40 patches from mutt upstream hg
>  repository.
>
> Please, try update and test. Thanks.
> Karel

I've updated my repository for the debian package:

https://gitorious.org/vjaquez-misc/mutt-kz

The "master" branch has the debian/ directory merged. The "upstream" branch has
Karel's master.

You can build it with debuild, like this

$ DEBUILD_DPKG_BUILDPACKAGE_OPTS="-us -uc -I -i" DEBUILD_LINTIAN_OPTS="-i -I --show-overrides" debuild

or you can use the old dpkg-buildpackage.

I've been using it since yesterday without any problem so far.

vmjl

[Edward Betts]

"Víctor M. Jáquez L."  wrote:
> I've updated my repository for the debian package:
>
> https://gitorious.org/vjaquez-misc/mutt-kz
>
> The "master" branch has the debian/ directory merged. The "upstream" branch has
> Karel's master.

Thanks for the package Víctor. I tried to build and install it, but the pgpring.1 man page is also in the signing-party package. Here is the error message:

dpkg: error processing archive mutt-kz_1.5.23.1_amd64.deb (--install):
 trying to overwrite '/usr/share/man/man1/pgpring.1.gz', which is also in package signing-party 1.1.12-1

You might want to remove the pgpring.1 man page. This was my fix:

diff --git a/debian/mutt-kz.manpages b/debian/mutt-kz.manpages
index 5af304a..684d424 100644
--- a/debian/mutt-kz.manpages
+++ b/debian/mutt-kz.manpages
@@ -3,7 +3,6 @@ debian/tmp/usr/share/man/man1/flea.1
 debian/tmp/usr/share/man/man1/mutt_dotlock.1
 debian/tmp/usr/share/man/man1/mutt.1
 debian/tmp/usr/share/man/man1/pgpewrap.1
-debian/tmp/usr/share/man/man1/pgpring.1
 debian/tmp/usr/share/man/man5/mmdf.5
 debian/tmp/usr/share/man/man5/muttrc.5
 debian/tmp/usr/share/man/man5/mbox.5

[Víctor M. Jáquez L.]

On 02/11/15 at 09:04am, Edward Betts wrote:
> "Víctor M. Jáquez L."  wrote:
> > I've updated my repository for the debian package:
> >
> > https://gitorious.org/vjaquez-misc/mutt-kz
> >
> > The "master" branch has the debian/ directory merged. The "upstream" branch has
> > Karel's master.
>
> Thanks for the package Víctor. I tried to build and install it, but the pgpring.1 man page is also in the signing-party package. Here is the error message:
>
> dpkg: error processing archive mutt-kz_1.5.23.1_amd64.deb (--install):
>  trying to overwrite '/usr/share/man/man1/pgpring.1.gz', which is also in package signing-party 1.1.12-1
>
> You might want to remove the pgpring.1 man page. This was my fix:

Thanks Edward!

I think we should rename the man page, since it's a specific mutt tool, but I
can't devote more time on it, so your proposal was pushed :)

vmjl
> diff --git a/debian/mutt-kz.manpages b/debian/mutt-kz.manpages
> index 5af304a..684d424 100644
> --- a/debian/mutt-kz.manpages
> +++ b/debian/mutt-kz.manpages
> @@ -3,7 +3,6 @@ debian/tmp/usr/share/man/man1/flea.1
>  debian/tmp/usr/share/man/man1/mutt_dotlock.1
>  debian/tmp/usr/share/man/man1/mutt.1
>  debian/tmp/usr/share/man/man1/pgpewrap.1
> -debian/tmp/usr/share/man/man1/pgpring.1
>  debian/tmp/usr/share/man/man5/mmdf.5
>  debian/tmp/usr/share/man/man5/muttrc.5
>  debian/tmp/usr/share/man/man5/mbox.5