Control: tag -1 + patch pending On Tue, 18 Jul 2017 11:27:56 +0200, gregor herrmann wrote:
> What also seems to work is the following workaround in debian/rules: > > diff -Nru uwsgi-2.0.15/debian/rules uwsgi-2.0.15/debian/rules > --- uwsgi-2.0.15/debian/rules 2017-02-20 11:40:46.000000000 +0100 > +++ uwsgi-2.0.15/debian/rules 2017-07-18 08:55:03.000000000 +0200 > @@ -259,9 +259,11 @@ > plugin_lang_kind = $(strip \ > $(if $(filter java python,$(plugin_lang)),\ > $(lastword $(subst -, ,$(plugin_kind))))) > -plugin_flavors = $(strip \ > - $(if $(filter python,$(plugin_lang)),\ > - $(cdbs_$(plugin_lang_kind:python=python2)_allflavors))) > +#workaround, cf. #865224 > +#plugin_flavors = $(strip \ > +# $(if $(filter python,$(plugin_lang)),\ > +# $(cdbs_$(plugin_lang_kind:python=python2)_allflavors))) > +plugin_flavors = $(plugin_defaultflavor) > plugin_defaultflavor = $(strip \ > $(if $(filter python,$(plugin_lang)),\ > $(cdbs_$(plugin_lang_kind:python=python2)_defaultflavor))) > [..] > Maybe that's a bit less invasive and a bit more binNMU friendly than > hardcoding 'X-Python3-Version: 3.5'? I've now uploaded this option; to DELAYED/1 in case there are some more comments. debdiff as uploaded attached. Cheers, gregor -- .''`. https://info.comodo.priv.at/ - Debian Developer https://www.debian.org : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D 85FA BB3A 6801 8649 AA06 `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Wir sind Helden: Kaputt
diff -Nru uwsgi-2.0.15/debian/changelog uwsgi-2.0.15/debian/changelog --- uwsgi-2.0.15/debian/changelog 2017-06-20 12:00:19.000000000 +0200 +++ uwsgi-2.0.15/debian/changelog 2017-07-18 22:27:56.000000000 +0200 @@ -1,3 +1,14 @@ +uwsgi (2.0.15-2.1) unstable; urgency=medium + + * Non-maintainer upload with maintainer's permission. + * Fix "ftbfs with multiple supported python3 versions": + debian/rules: workaround cdbs issue #868752 by using only the default + python flavors. + Thanks to Niko Tyni and Scott Kitterman for their analyses. + (Closes: #865224) + + -- gregor herrmann <gre...@debian.org> Tue, 18 Jul 2017 22:27:56 +0200 + uwsgi (2.0.15-2) unstable; urgency=medium * Add patches cherry-picked upstream: diff -Nru uwsgi-2.0.15/debian/rules uwsgi-2.0.15/debian/rules --- uwsgi-2.0.15/debian/rules 2017-02-20 11:40:46.000000000 +0100 +++ uwsgi-2.0.15/debian/rules 2017-07-18 17:27:48.000000000 +0200 @@ -259,9 +259,12 @@ plugin_lang_kind = $(strip \ $(if $(filter java python,$(plugin_lang)),\ $(lastword $(subst -, ,$(plugin_kind))))) -plugin_flavors = $(strip \ - $(if $(filter python,$(plugin_lang)),\ - $(cdbs_$(plugin_lang_kind:python=python2)_allflavors))) +# workaround for #868752 +#plugin_flavors = $(strip \ +# $(if $(filter python,$(plugin_lang)),\ +# $(cdbs_$(plugin_lang_kind:python=python2)_allflavors))) +plugin_flavors = $(plugin_defaultflavor) +# workaround end plugin_defaultflavor = $(strip \ $(if $(filter python,$(plugin_lang)),\ $(cdbs_$(plugin_lang_kind:python=python2)_defaultflavor)))
signature.asc
Description: Digital Signature
