scheme/sieve2scm.scmi | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 modify sieve.scm's --help output to accommodate help2man.
 Make a pair of simple cosmetic changes to sieve.scm's --help output
 in order to make help2man work, for manpage generation.

doc/imprimatur/rendition.texi | 12 6 + 6 - 0 !
doc/texinfo/programs.texi | 16 8 + 8 - 0 !
2 files changed, 14 insertions(+), 14 deletions(-)

 fix texinfo build with texinfo 5.x.
 Texinfo 5.0 is more strict about some syntax errors. This patch fixes
 some fatal issues with @itemx usage.

configure.ac | 2 0 + 2 - 0 !
1 file changed, 2 deletions(-)

 do not set hardcoded dependencies for tokyo or kyoto cabinet.
 Tokyo Cabinet and Kyoto Cabinet support force the inclusion of -lz -lbz2
 and -lrt into DEPENDENCIES, while none of the symbols in those libraries
 are used. Avoid hardcoding them and let both libs decide what needs to
 be added to DBMLIBS.

configure.ac | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 workaround guile's pkg-config not defining 'bindir'
 Mailutils' Guile check assumes `guile-config info bindir` is defined.
 It isn't, so for now just add '/bin' to the output of the configured
 prefix. guile-config is deprecated in favour of pkg-config, and
 actually uses pkg-config calls internally, so the optimal fix would be
 to replace the whole thing with pkg-config.

libmailutils/auth/system.c | 17 14 + 3 - 0 !
1 file changed, 14 insertions(+), 3 deletions(-)

 fix a segfault in pop3d when receiving user and pass.
 crypt() returned NULL, making strcmp() segfault.
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720060

mail/mailline.c | 2 1 + 1 - 0 !
mu/shell.c | 2 1 + 1 - 0 !
2 files changed, 2 insertions(+), 2 deletions(-)

 update for readline api changes

gint/gint.mk | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 10_guile-snarf-cpp.diff: fix ftbfs on *ix86 caused by #759096
 (guile-snarf hard-codes the at-build-time-default-compiler) by explicitely
 adding CPP="@CPP@" to guile-snarf's run-time environment.