[PATCH 1/5] debian/control: build-depend on python3-sphinx instead of python-sphinx

[Tomi Ollila]

On Thu, Nov 30 2017, Daniel Kahn Gillmor wrote:

> On Thu 2017-11-30 04:40:39 -0500, Daniel Kahn Gillmor wrote:
>> python2 is going to be deprecated, and python3-sphinx is available all
>> the way back to oldoldstable.  let's use the more modern version.
>> ---
>>  debian/control | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/debian/control b/debian/control
>> index 20b8a2db..3a624fdc 100644
>> --- a/debian/control
>> +++ b/debian/control
>> @@ -18,7 +18,7 @@ Build-Depends:
>>   python3-all (>= 3.1.2-7~),
>>   dh-python,
>>   dh-elpa (>= 1.3),
>> - python-sphinx (>= 1.0),
>> + python3-sphinx,
>>   ruby, ruby-dev (>>1:1.9.3~),
>>   emacs25-nox | emacs25 (>=25~) | emacs25-lucid (>=25~) |
>>   emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~) |
>
> hm, on further reflection, this one is specifically problematic because
> of the use of:
>
>     ${python} -m sphinx.writers.manpage
>
> in ./configure, used to test for the presence of the sphinx module.
>
> This can be fixed by preferring python3 here:
>
> --- a/configure
> +++ b/configure
> @@ -557,7 +557,7 @@ fi
>  printf "Checking for python... "
>  have_python=0
>  
> -for name in ${PYTHON} python python2 python3; do
> +for name in ${PYTHON} python3 python python2; do

>      if command -v $name > /dev/null; then
>         have_python=1
>         python=$name
>
> any thoughts or preferences on this?

I'd like this change. I was going to suggest "${PYTHON}" there
but perhaps if one sets e.g.

PYTHON='/usr/local/bin/python3 -B -E -u'

The above would still work (I'd say this is potentially more useful
than supporting whitespace in paths).

Tomi


>
>         --dkg