SOURCES: python-ac_fixes.patch, python-db4.6.patch - updated to py...

[wrobell]

Author: wrobell                      Date: Tue Feb 26 21:40:21 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to python 2.5.2

---- Files affected:
SOURCES:
   python-ac_fixes.patch (1.4 -> 1.5) , python-db4.6.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/python-ac_fixes.patch
diff -u SOURCES/python-ac_fixes.patch:1.4 SOURCES/python-ac_fixes.patch:1.5
--- SOURCES/python-ac_fixes.patch:1.4	Fri Aug 25 19:32:35 2006
+++ SOURCES/python-ac_fixes.patch	Tue Feb 26 22:40:15 2008
@@ -1,14 +1,15 @@
---- Python-2.5b2/configure.in.orig	2006-07-06 11:13:35.000000000 +0100
-+++ Python-2.5b2/configure.in	2006-07-12 16:30:30.000000000 +0100
-@@ -753,13 +753,13 @@
+diff -Nur Python-2.5.2.orig/configure.in Python-2.5.2/configure.in
+--- Python-2.5.2.orig/configure.in	2008-02-13 19:17:17.000000000 +0000
++++ Python-2.5.2/configure.in	2008-02-26 09:43:17.000000000 +0000
+@@ -767,13 +767,13 @@
  	    if test "$Py_DEBUG" = 'true' ; then
  		# Optimization messes up debuggers, so turn it off for
  		# debug builds.
 -		OPT="-g -Wall $STRICT_PROTO"
 +		OPT="-g $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
  	    else
--		OPT="-g -O3 -Wall $STRICT_PROTO"
-+		OPT="-g $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
+-		OPT="-g $WRAP -O3 -Wall $STRICT_PROTO"
++		OPT="-g $WRAP $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
  	    fi
  	    ;;
  	*)
@@ -17,9 +18,10 @@
  	    ;;
  	esac
  	case $ac_sys_system in
---- Python-2.5c1.orig/Makefile.pre.in	2006-07-30 17:20:10.000000000 +0100
-+++ Python-2.5c1/Makefile.pre.in	2006-08-25 17:51:05.000000000 +0100
-@@ -852,7 +852,7 @@
+diff -Nur Python-2.5.2.orig/Makefile.pre.in Python-2.5.2/Makefile.pre.in
+--- Python-2.5.2.orig/Makefile.pre.in	2007-12-05 20:43:57.000000000 +0000
++++ Python-2.5.2/Makefile.pre.in	2008-02-26 09:41:02.000000000 +0000
+@@ -861,7 +861,7 @@
  	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
  	# Substitution happens here, as the completely-expanded BINDIR
  	# is not available in configure

================================================================
Index: SOURCES/python-db4.6.patch
diff -u SOURCES/python-db4.6.patch:1.1 SOURCES/python-db4.6.patch:1.2
--- SOURCES/python-db4.6.patch:1.1	Sat Jul 28 00:46:46 2007
+++ SOURCES/python-db4.6.patch	Tue Feb 26 22:40:15 2008
@@ -1,11 +1,16 @@
---- Python-2.5.1/setup.py~	2007-07-27 20:10:06.000000000 +0200
-+++ Python-2.5.1/setup.py	2007-07-27 22:11:36.000000000 +0200
-@@ -606,7 +606,7 @@
+--- Python-2.5.2/setup.py.orig	2008-02-04 23:41:02.000000000 +0000
++++ Python-2.5.2/setup.py	2008-02-26 21:04:48.000000000 +0000
+@@ -608,11 +608,11 @@
          # a release.  Most open source OSes come with one or more
          # versions of BerkeleyDB already installed.
  
 -        max_db_ver = (4, 5)
 +        max_db_ver = (4, 6)
-         min_db_ver = (3, 3)
+         # NOTE: while the _bsddb.c code links against BerkeleyDB 4.6.x
+         # we leave that version disabled by default as it has proven to be
+         # quite a buggy library release on many platforms.
+-        min_db_ver = (3, 3)
++        min_db_ver = (4, 6)
          db_setup_debug = False   # verbose debug prints from this script?
  
+         # construct a list of paths to look for the header file in on
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/python-ac_fixes.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/python-db4.6.patch?r1=1.1&r2=1.2&f=u