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

@@ -7,11 +7,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
configure.in | 9 +++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
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
@@ -861,7 +861,7 @@
--- Python-2.7.2.orig/Makefile.pre.in
+++ Python-2.7.2/Makefile.pre.in
@@ -867,7 +867,7 @@
multiprocessing multiprocessing/dummy \
unittest \
lib-old \
@@ -19,8 +19,8 @@ Index: Python-2.7.1/Makefile.pre.in
+ $(MACHDEPS)
ifeq (@TEST_MODULES@,yes)
LIBSUBDIRS += test test/data \
@@ -902,6 +902,10 @@
LIBSUBDIRS += test test/data \
@@ -906,6 +906,10 @@
endif
endif
@@ -31,11 +31,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
@@ -2410,6 +2410,15 @@
--- Python-2.7.2.orig/configure.in
+++ Python-2.7.2/configure.in
@@ -2425,6 +2425,15 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
fi