-
Committer:
Bazaar Package Importer
-
Author(s):
Iain Lane
-
Date:
2008-06-17 17:05:11 UTC
-
mfrom:
(2.1.3 lenny)
-
Revision ID:
james.westby@ubuntu.com-20080617170511-lmtfb8s0obc3oa0g
Tags: 1.34.1-11ubuntu1
* Merge with Debian (LP: #240710), remaining changes:
+ Tell bjam that we're using gcc; otherwise, the -fno-strict-aliasing
fix for building with gcc-4.2 fails when CFLAGS is set in the
environment.
+ GCCXMLParser.py: Use ElementTree from the python2.5 standard
library.
* Modify Maintainer value to match the DebianMaintainerField
specification.