[pkg-boost-commits] r14242 - in boost/trunk/debian: . patches

[smr at alioth.debian.org]

Author: smr
Date: 2008-07-07 03:46:19 +0000 (Mon, 07 Jul 2008)
New Revision: 14242

Added:
   boost/trunk/debian/patches/python2.5-elementtree.patch
Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/series
Log:
Use cElementTree from xml.etree, if available.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2008-06-10 16:00:30 UTC (rev 14241)
+++ boost/trunk/debian/changelog	2008-07-07 03:46:19 UTC (rev 14242)
@@ -1,13 +1,18 @@
-boost1.35 (1.35.0-6) unstable; urgency=low
+boost1.35 (1.35.0-6) UNRELEASED; urgency=low
 
   [ Steve M. Robbins ]
+
   * debian/patches/test-child-exit-t1723.patch: New.  Ignore child process
     if return status is zero (normal); fix for Boost ticket 1723.
+  
+  * debian/patches/python2.5-elementtree.patch: New.  Use cElementTree
+    from xml.etree, if available (python 2.5).  Closes: #489022.
 
   [ Domenico Andreoli ]
+  
   * debian/rules: perform parallel builds as per $DEB_BUILD_OPTIONS 
 
- -- Domenico Andreoli <cavok at debian.org>  Tue, 10 Jun 2008 17:41:35 +0200
+ -- Steve M. Robbins <smr at debian.org>  Sun, 06 Jul 2008 22:58:37 -0500
 
 boost1.35 (1.35.0-5) unstable; urgency=low
 

Added: boost/trunk/debian/patches/python2.5-elementtree.patch
===================================================================
--- boost/trunk/debian/patches/python2.5-elementtree.patch	                        (rev 0)
+++ boost/trunk/debian/patches/python2.5-elementtree.patch	2008-07-07 03:46:19 UTC (rev 14242)
@@ -0,0 +1,23 @@
+--- boost1.35-1.35.0.orig/libs/python/pyste/src/Pyste/GCCXMLParser.py
++++ boost1.35-1.35.0/libs/python/pyste/src/Pyste/GCCXMLParser.py
+@@ -4,12 +4,16 @@
+ # http://www.boost.org/LICENSE_1_0.txt)
+ 
+ from declarations import *
+-# try to use cElementTree if avaiable
+ try:
+-    from cElementTree import ElementTree    
++	# try to use internal elementtree
++    from xml.etree.cElementTree import ElementTree
+ except ImportError:
+-    # fall back to the normal elementtree
+-    from elementtree.ElementTree import ElementTree
++    # try to use cElementTree if avaiable
++    try:
++        from cElementTree import ElementTree    
++    except ImportError:
++        # fall back to the normal elementtree
++        from elementtree.ElementTree import ElementTree
+ from xml.parsers.expat import ExpatError
+ from copy import deepcopy
+ from utils import enumerate

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2008-06-10 16:00:30 UTC (rev 14241)
+++ boost/trunk/debian/patches/series	2008-07-07 03:46:19 UTC (rev 14242)
@@ -1,3 +1,4 @@
+python2.5-elementtree.patch
 test-child-exit-t1723.patch
 serialization-intrinsic64.patch
 library-naming.patch