python: bump to 2.7.2

This is mostly a mechanical bump, with a refresh of all the patches to
accomodate the offsets, and some minor conflict resolution.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Thomas Petazzoni
2011-09-18 18:05:23 +02:00
committed by Peter Korsgaard
parent a21642c7eb
commit 2455c89bab
30 changed files with 279 additions and 286 deletions

View File

@@ -14,20 +14,20 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
setup.py | 2 +-
3 files changed, 19 insertions(+), 7 deletions(-)
Index: Python-2.7.1/Makefile.pre.in
Index: Python-2.7.2/Makefile.pre.in
===================================================================
--- Python-2.7.1.orig/Makefile.pre.in
+++ Python-2.7.1/Makefile.pre.in
@@ -857,7 +857,7 @@
json \
--- Python-2.7.2.orig/Makefile.pre.in
+++ Python-2.7.2/Makefile.pre.in
@@ -863,7 +863,7 @@
sqlite3 \
logging bsddb csv importlib wsgiref \
ctypes ctypes/macholib idlelib idlelib/Icons \
- distutils distutils/command $(XMLLIBSUBDIRS) \
ctypes ctypes/macholib idlelib idlelib/Icons \
- distutils distutils/command $(XMLLIBSUBDIRS) \
+ distutils distutils/command \
multiprocessing multiprocessing/dummy \
unittest \
lib-old \
@@ -906,6 +906,10 @@
@@ -910,6 +910,10 @@
LIBSUBDIRS += curses
endif
@@ -38,11 +38,11 @@ Index: Python-2.7.1/Makefile.pre.in
libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
Index: Python-2.7.1/configure.in
Index: Python-2.7.2/configure.in
===================================================================
--- Python-2.7.1.orig/configure.in
+++ Python-2.7.1/configure.in
@@ -2087,13 +2087,21 @@
--- Python-2.7.2.orig/configure.in
+++ Python-2.7.2/configure.in
@@ -2102,13 +2102,21 @@
AC_SUBST(DISABLED_EXTENSIONS)
# Check for use of the system expat library
@@ -69,11 +69,11 @@ Index: Python-2.7.1/configure.in
# Check for use of the system libffi library
AC_MSG_CHECKING(for --with-system-ffi)
Index: Python-2.7.1/setup.py
Index: Python-2.7.2/setup.py
===================================================================
--- Python-2.7.1.orig/setup.py
+++ Python-2.7.1/setup.py
@@ -1383,7 +1383,7 @@
--- Python-2.7.2.orig/setup.py
+++ Python-2.7.2/setup.py
@@ -1403,7 +1403,7 @@
#
# More information on Expat can be found at www.libexpat.org.
#