Cherry-pick 0001-fix-typo-procedes-proceeds.patch and...

  * New upstream version 0.31

  * Ensure at least meson 0.47

  * Cherry-pick 0001-fix-typo-procedes-proceeds.patch and

    0002-Fix-race-condition-with-sphinx-and-parallel-builds.patch from

    upstream (closes: #908756)

 -- Florian Schlichting <fsfs@debian.org>  Sun, 06 Jan 2019 19:33:09 +0100

From: Florian Schlichting <fsfs@debian.org>

Date: Mon, 29 Oct 2018 20:58:25 +0100

Subject: fix typo procedes -> proceeds

found by Debian's lintian spell checker

---

 doc/index.rst | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/index.rst b/doc/index.rst

index 991e60c..1079735 100644

--- a/doc/index.rst

+++ b/doc/index.rst

@@ -181,7 +181,7 @@ Player Commands

 :command:`seekthrough [+\-][<HH:MM:SS>]` - Seeks by hour,

    minute or seconds, hours or minutes can be omitted, relatively to

    the current position. If the duration exceeds the limit of the

-   current song, the seek command procedes to seek through the playlist

+   current song, the seek command proceeds to seek through the playlist

    until the duration is reached.

    If a :samp:`+` is used, the seek is forward. If a :samp:`-` is

    used, the seek is backward. Forward seeking by default.

From: Florian Schlichting <fsfs@debian.org>

Date: Mon, 29 Oct 2018 22:46:57 +0100

Subject: Fix race condition with sphinx and parallel builds

by using separate doctrees for the html docs and the manpage

This is in response to Debian bug https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908756 and follows the fix found for ncmpc https://github.com/MusicPlayerDaemon/ncmpc/commit/d5aff222515ccd3ab8068796d5c13abf9329e11c

---

 doc/meson.build | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/meson.build b/doc/meson.build

index 7188fc6..8eeaf08 100644

--- a/doc/meson.build

+++ b/doc/meson.build

@@ -2,7 +2,7 @@ custom_target(

   'HTML documentation',

   output: 'html',

   input: ['index.rst', 'conf.py'],

-  command: [sphinx, '-q', '-b', 'html', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@'],

+  command: [sphinx, '-q', '-b', 'html', '-d', '@OUTDIR@/html_doctrees', meson.current_source_dir(), '@OUTPUT@'],

   build_by_default: true,

   install: true,

   install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),

@@ -12,7 +12,7 @@ custom_target(

   'Manpage documentation',

   output: 'man',

   input: ['index.rst', 'conf.py'],

-  command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@/man1'],

+  command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees', meson.current_source_dir(), '@OUTPUT@/man1'],

   build_by_default: true,

   install: true,

   install_dir: get_option('datadir'),

0001-fix-typo-procedes-proceeds.patch

0002-Fix-race-condition-with-sphinx-and-parallel-builds.patch