diff -Nru spyder-3.0.2+dfsg1/debian/changelog spyder-3.0.2+dfsg1/debian/changelog --- spyder-3.0.2+dfsg1/debian/changelog 2016-12-15 10:33:23.000000000 +0100 +++ spyder-3.0.2+dfsg1/debian/changelog 2017-02-09 22:58:47.000000000 +0100 @@ -1,3 +1,10 @@ +spyder (3.0.2+dfsg1-0ubuntu0.2) yakkety; urgency=medium + + * Cherry-pick upstream fixes for bugs found on errors.ubuntu.com: + - fix Spyder language-setting-startUp when locale is unknown (LP: #1663397) + + -- Benjamin Drung Thu, 09 Feb 2017 22:58:47 +0100 + spyder (3.0.2+dfsg1-0ubuntu0.1) yakkety; urgency=medium * New upstream version, enables spyder to run on yakkety diff -Nru spyder-3.0.2+dfsg1/debian/patches/0002-fix-Spyder-language-setting-startUp.patch spyder-3.0.2+dfsg1/debian/patches/0002-fix-Spyder-language-setting-startUp.patch --- spyder-3.0.2+dfsg1/debian/patches/0002-fix-Spyder-language-setting-startUp.patch 1970-01-01 01:00:00.000000000 +0100 +++ spyder-3.0.2+dfsg1/debian/patches/0002-fix-Spyder-language-setting-startUp.patch 2017-02-09 22:58:20.000000000 +0100 @@ -0,0 +1,25 @@ +From f85f6ae25ff42039142431b29c706351c269486e Mon Sep 17 00:00:00 2001 +From: "Wallas Linux Deepin 15.03 Machine" +Date: Wed, 16 Nov 2016 17:17:00 -0500 +Subject: [PATCH] fix Spyder language-setting-startUp + +--- + spyder/config/base.py | 27 +++++++++++++++------------ + 1 file changed, 15 insertions(+), 12 deletions(-) + +--- a/spyder/config/base.py ++++ b/spyder/config/base.py +@@ -265,7 +265,12 @@ + 2.) Spyder provides ('en', 'fr', 'es' and 'pt_BR'), if the locale is + either 'pt' or 'pt_BR', this function will return 'pt_BR' + """ +- locale_language = locale.getdefaultlocale()[0] ++ ++ # Solves issue #3627 ++ try: ++ locale_language = locale.getdefaultlocale()[0] ++ except ValueError: ++ locale_language = DEFAULT_LANGUAGE + + language = DEFAULT_LANGUAGE + diff -Nru spyder-3.0.2+dfsg1/debian/patches/series spyder-3.0.2+dfsg1/debian/patches/series --- spyder-3.0.2+dfsg1/debian/patches/series 2016-10-30 19:22:44.000000000 +0100 +++ spyder-3.0.2+dfsg1/debian/patches/series 2017-02-09 22:56:22.000000000 +0100 @@ -1 +1,2 @@ 0001-fix-spyderlib-path.patch +0002-fix-Spyder-language-setting-startUp.patch