From 7076e6f61cbcd45f463eb70ab1ffbb8ff7f27819 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 16 Jun 2015 23:36:11 +0200 Subject: python: bump to 2.7.10 Patches are simply refreshed, except 004-sysconfigdata-install-location.patch where a minor conflict resolution was needed. [Peter: fixup .hash as pointed out by Arnout] Signed-off-by: Thomas Petazzoni Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- package/python/101-optional-pydoc.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/python/101-optional-pydoc.patch') diff --git a/package/python/101-optional-pydoc.patch b/package/python/101-optional-pydoc.patch index d5dc3d72f9..143e11ab92 100644 --- a/package/python/101-optional-pydoc.patch +++ b/package/python/101-optional-pydoc.patch @@ -40,7 +40,7 @@ Index: b/configure.ac =================================================================== --- a/configure.ac +++ b/configure.ac -@@ -2627,6 +2627,11 @@ +@@ -2633,6 +2633,11 @@ AC_CHECK_FUNCS(pthread_atfork) fi @@ -56,7 +56,7 @@ Index: b/setup.py =================================================================== --- a/setup.py +++ b/setup.py -@@ -2222,6 +2222,12 @@ +@@ -2211,6 +2211,12 @@ # turn off warnings when deprecated modules are imported import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -69,7 +69,7 @@ Index: b/setup.py setup(# PyPI Metadata (PEP 301) name = "Python", version = sys.version.split()[0], -@@ -2242,9 +2248,7 @@ +@@ -2231,9 +2237,7 @@ ext_modules=[Extension('_struct', ['_struct.c'])], # Scripts to install -- cgit v1.2.3