Merge branch 'release'

These are the (tentative) changes for 0.23.5

diff --combined configure
index 72db26dfc52e6ae287bebe96c03e2e38e4d27f34,f17730441298648bcc31a66992ccd38ef259d6bb..ddfbbabfe4820f178fe00b592d2a22ac7a6ad284
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -70,7 -70,6 +70,7 @@@ LIBDIR
  WITH_DOCS=1
  WITH_API_DOCS=1
  WITH_EMACS=1
 +WITH_DESKTOP=1
  WITH_BASH=1
  WITH_RUBY=1
  WITH_ZSH=1
@@@ -142,7 -141,6 +142,7 @@@ Some features can be disabled (--with-f
        --without-docs                  Do not install documentation
        --without-api-docs              Do not install API man page
        --without-emacs                 Do not install lisp file
 +      --without-desktop               Do not install desktop file
        --without-ruby                  Do not install ruby bindings
        --without-zsh-completion        Do not install zsh completions files
        --without-retry-lock            Do not use blocking xapian opens, even if available
@@@ -211,14 -209,6 +211,14 @@@ for option; d
        fi
      elif [ "${option}" = '--without-emacs' ] ; then
        WITH_EMACS=0
 +    elif [ "${option%%=*}" = '--with-desktop' ]; then
 +      if [ "${option#*=}" = 'no' ]; then
 +          WITH_DESKTOP=0
 +      else
 +          WITH_DESKTOP=1
 +      fi
 +    elif [ "${option}" = '--without-desktop' ] ; then
 +      WITH_DESKTOP=0
      elif [ "${option%%=*}" = '--with-bash-completion' ]; then
        if [ "${option#*=}" = 'no' ]; then
            WITH_BASH=0
@@@ -284,7 -274,7 +284,7 @@@ if [ -z "$LIBDIR" ] ; the
      libdir_expanded="${PREFIX}/lib"
  else
      # very non-general variable expansion
-     libdir_expanded=$(echo "$LIBDIR" | sed "s|\\${prefix}|${PREFIX}|g; s|\\$prefix/|${PREFIX}/|; s|//*|/|g")
+     libdir_expanded=$(printf %s "$LIBDIR" | sed "s|\${prefix}|${PREFIX}|; s|\$prefix\>|${PREFIX}|; s|//*|/|g")
  fi
  
  cat <<EOF
@@@ -612,16 -602,6 +612,16 @@@ if [ $WITH_DOCS = "1" ] ; the
      fi
  fi
  
 +if [ $WITH_DESKTOP = "1" ]; then
 +    printf "Checking if desktop-file-install is available... "
 +    if command -v desktop-file-install > /dev/null; then
 +      printf "Yes.\n"
 +    else
 +      printf "No (so will not install .desktop file).\n"
 +      WITH_DESKTOP=0
 +    fi
 +fi
 +
  libdir_in_ldconfig=0
  
  printf "Checking which platform we are on... "
@@@ -1143,9 -1123,6 +1143,9 @@@ VALGRIND_CFLAGS = ${valgrind_cflags
  # Support for emacs
  WITH_EMACS = ${WITH_EMACS}
  
 +# Support for desktop file
 +WITH_DESKTOP = ${WITH_DESKTOP}
 +
  # Support for bash completion
  WITH_BASH = ${WITH_BASH}
  
@@@ -1165,7 -1142,6 +1165,7 @@@ COMMON_CONFIGURE_CFLAGS = \
        -DSTD_GETPWUID=\$(STD_GETPWUID)                         \\
        -DSTD_ASCTIME=\$(STD_ASCTIME)                           \\
        -DHAVE_XAPIAN_COMPACT=\$(HAVE_XAPIAN_COMPACT)           \\
 +      -DSILENCE_XAPIAN_DEPRECATION_WARNINGS                   \\
        -DHAVE_XAPIAN_FIELD_PROCESSOR=\$(HAVE_XAPIAN_FIELD_PROCESSOR) \\
        -DHAVE_XAPIAN_DB_RETRY_LOCK=\$(HAVE_XAPIAN_DB_RETRY_LOCK) \\
        -DUTIL_BYTE_ORDER=\$(UTIL_BYTE_ORDER)

diff --combined doc/conf.py
index b6cfa1aa3499d468d3fb7f8f22661a2375b0e75a,356a2b2b9e0b32db596c4e8301b42977f565e606..a3d8269696a366dca12b1caa4a8d67e6005d993c
--- 1/doc/conf.py
--- 2/doc/conf.py
+++ b/doc/conf.py
@@@ -12,7 -12,7 +12,7 @@@ master_doc = 'index
  
  # General information about the project.
  project = u'notmuch'
- copyright = u'2009-2016, Carl Worth and many others'
+ copyright = u'2009-2017, Carl Worth and many others'
  
  location = os.path.dirname(__file__)
  
@@@ -52,74 -52,74 +52,74 @@@ htmlhelp_basename = 'notmuchdoc
  # One entry per manual page. List of tuples
  # (source start file, name, description, authors, manual section).
  
 -man_pages = [
 -
 -('man1/notmuch','notmuch',
 -        u'thread-based email index, search, and tagging',
 -        [u'Carl Worth and many others'], 1),
 -
 -('man1/notmuch-address','notmuch-address',
 -        u'output addresses from matching messages',
 -        [u'Carl Worth and many others'], 1),
 +notmuch_authors = u'Carl Worth and many others'
  
 -('man1/notmuch-compact','notmuch-compact',
 -        u'compact the notmuch database',
 -        [u'Carl Worth and many others'], 1),
 +man_pages = [
 +    ('man1/notmuch', 'notmuch',
 +     u'thread-based email index, search, and tagging',
 +     [notmuch_authors], 1),
  
 -('man1/notmuch-config','notmuch-config',
 -        u'access notmuch configuration file',
 -        [u'Carl Worth and many others'], 1),
 +    ('man1/notmuch-address', 'notmuch-address',
 +     u'output addresses from matching messages',
 +     [notmuch_authors], 1),
  
 -('man1/notmuch-count','notmuch-count',
 -        u'count messages matching the given search terms',
 -        [u'Carl Worth and many others'], 1),
 +    ('man1/notmuch-compact', 'notmuch-compact',
 +     u'compact the notmuch database',
 +     [notmuch_authors], 1),
  
 -('man1/notmuch-dump','notmuch-dump',
 -        u'creates a plain-text dump of the tags of each message',
 -        [u'Carl Worth and many others'], 1),
 +    ('man1/notmuch-config', 'notmuch-config',
 +     u'access notmuch configuration file',
 +     [notmuch_authors], 1),
  
 -('man1/notmuch-emacs-mua','notmuch-emacs-mua',
 -        u'send mail with notmuch and emacs',
 -        [u'Carl Worth and many others'], 1),
 +    ('man1/notmuch-count', 'notmuch-count',
 +     u'count messages matching the given search terms',
 +     [notmuch_authors], 1),
  
 -('man5/notmuch-hooks','notmuch-hooks',
 -        u'hooks for notmuch',
 -        [u'Carl Worth and many others'], 5),
 +    ('man1/notmuch-dump', 'notmuch-dump',
 +     u'creates a plain-text dump of the tags of each message',
 +     [notmuch_authors], 1),
  
 -('man1/notmuch-insert','notmuch-insert',
 -        u'add a message to the maildir and notmuch database',
 -        [u'Carl Worth and many others'], 1),
 +    ('man1/notmuch-emacs-mua', 'notmuch-emacs-mua',
 +     u'send mail with notmuch and emacs',
 +     [notmuch_authors], 1),
  
 -('man1/notmuch-new','notmuch-new',
 -        u'incorporate new mail into the notmuch database',
 -        [u'Carl Worth and many others'], 1),
 +    ('man5/notmuch-hooks', 'notmuch-hooks',
 +     u'hooks for notmuch',
 +     [notmuch_authors], 5),
  
 -('man1/notmuch-reply','notmuch-reply',
 -        u'constructs a reply template for a set of messages',
 -        [u'Carl Worth and many others'], 1),
 +    ('man1/notmuch-insert', 'notmuch-insert',
 +     u'add a message to the maildir and notmuch database',
 +     [notmuch_authors], 1),
  
 -('man1/notmuch-restore','notmuch-restore',
 -        u'restores the tags from the given file (see notmuch dump)',
 -        [u'Carl Worth and many others'], 1),
 +    ('man1/notmuch-new', 'notmuch-new',
 +     u'incorporate new mail into the notmuch database',
 +     [notmuch_authors], 1),
  
 -('man1/notmuch-search','notmuch-search',
 -        u'search for messages matching the given search terms',
 -        [u'Carl Worth and many others'], 1),
 +    ('man1/notmuch-reply', 'notmuch-reply',
 +     u'constructs a reply template for a set of messages',
 +     [notmuch_authors], 1),
  
 -('man7/notmuch-search-terms','notmuch-search-terms',
 -        u'syntax for notmuch queries',
 -        [u'Carl Worth and many others'], 7),
 +    ('man1/notmuch-restore', 'notmuch-restore',
 +     u'restores the tags from the given file (see notmuch dump)',
 +     [notmuch_authors], 1),
  
 -('man1/notmuch-show','notmuch-show',
 -        u'show messages matching the given search terms',
 -        [u'Carl Worth and many others'], 1),
 +    ('man1/notmuch-search', 'notmuch-search',
 +     u'search for messages matching the given search terms',
 +     [notmuch_authors], 1),
  
 -('man1/notmuch-tag','notmuch-tag',
 -        u'add/remove tags for all messages matching the search terms',
 -        [u'Carl Worth and many others'], 1),
 +    ('man7/notmuch-search-terms', 'notmuch-search-terms',
 +     u'syntax for notmuch queries',
 +     [notmuch_authors], 7),
  
 +    ('man1/notmuch-show', 'notmuch-show',
 +     u'show messages matching the given search terms',
 +     [notmuch_authors], 1),
  
 +    ('man1/notmuch-tag', 'notmuch-tag',
 +     u'add/remove tags for all messages matching the search terms',
 +     [notmuch_authors], 1),
  ]
 +
  # If true, show URL addresses after external links.
  #man_show_urls = False
  
@@@ -132,19 -132,52 +132,19 @@@
  texinfo_no_detailmenu = True
  
  texinfo_documents = [
 - ('notmuch-emacs', 'notmuch-emacs', u'notmuch Documentation',
 -   u'Carl Worth and many others', 'notmuch-emacs',
 -   'emacs based front-end for notmuch', 'Miscellaneous'),
 -('man1/notmuch','notmuch',u'notmuch Documentation',
 -      u'Carl Worth and many others', 'notmuch',
 -      'thread-based email index, search, and tagging','Miscellaneous'),
 -('man1/notmuch-address','notmuch-address',u'notmuch Documentation',
 -      u'Carl Worth and many others', 'notmuch-address',
 -      'output addresses from matching messages','Miscellaneous'),
 -('man1/notmuch-compact','notmuch-compact',u'notmuch Documentation',
 -      u'Carl Worth and many others', 'notmuch-compact',
 -      'compact the notmuch database','Miscellaneous'),
 -('man1/notmuch-config','notmuch-config',u'notmuch Documentation',
 -      u'Carl Worth and many others', 'notmuch-config',
 -      'access notmuch configuration file','Miscellaneous'),
 -('man1/notmuch-count','notmuch-count',u'notmuch Documentation',
 -      u'Carl Worth and many others', 'notmuch-count',
 -      'count messages matching the given search terms','Miscellaneous'),
 -('man1/notmuch-dump','notmuch-dump',u'notmuch Documentation',
 -      u'Carl Worth and many others', 'notmuch-dump',
 -      'creates a plain-text dump of the tags of each message','Miscellaneous'),
 -('man5/notmuch-hooks','notmuch-hooks',u'notmuch Documentation',
 -      u'Carl Worth and many others', 'notmuch-hooks',
 -      'hooks for notmuch','Miscellaneous'),
 -('man1/notmuch-insert','notmuch-insert',u'notmuch Documentation',
 -      u'Carl Worth and many others', 'notmuch-insert',
 -      'add a message to the maildir and notmuch database','Miscellaneous'),
 -('man1/notmuch-new','notmuch-new',u'notmuch Documentation',
 -      u'Carl Worth and many others', 'notmuch-new',
 -      'incorporate new mail into the notmuch database','Miscellaneous'),
 -('man1/notmuch-reply','notmuch-reply',u'notmuch Documentation',
 -      u'Carl Worth and many others', 'notmuch-reply',
 -      'constructs a reply template for a set of messages','Miscellaneous'),
 -('man1/notmuch-restore','notmuch-restore',u'notmuch Documentation',
 -      u'Carl Worth and many others', 'notmuch-restore',
 -      'restores the tags from the given file (see notmuch dump)','Miscellaneous'),
 -('man1/notmuch-search','notmuch-search',u'notmuch Documentation',
 -      u'Carl Worth and many others', 'notmuch-search',
 -      'search for messages matching the given search terms','Miscellaneous'),
 -('man7/notmuch-search-terms','notmuch-search-terms',u'notmuch Documentation',
 -      u'Carl Worth and many others', 'notmuch-search-terms',
 -      'syntax for notmuch queries','Miscellaneous'),
 -('man1/notmuch-show','notmuch-show',u'notmuch Documentation',
 -      u'Carl Worth and many others', 'notmuch-show',
 -      'show messages matching the given search terms','Miscellaneous'),
 -('man1/notmuch-tag','notmuch-tag',u'notmuch Documentation',
 -      u'Carl Worth and many others', 'notmuch-tag',
 -      'add/remove tags for all messages matching the search terms','Miscellaneous'),
 +    ('notmuch-emacs', 'notmuch-emacs', u'notmuch-emacs documentation',
 +     notmuch_authors, 'notmuch-emacs',
 +     'emacs based front-end for notmuch', 'Miscellaneous'),
  ]
 +
 +# generate texinfo list from man page list
 +texinfo_documents += [
 +    (
 +        x[0],                         # source start file
 +        x[1],                         # target name
 +        x[1] + u' documentation',     # title
 +        x[3][0],                      # author
 +        x[1],                         # dir menu entry
 +        x[2],                         # description
 +        'Miscellaneous'                       # category
 +    ) for x in man_pages]