-
Committer:
Bazaar Package Importer
-
Author(s):
Stefano Rivera
-
Date:
2010-10-24 23:12:48 UTC
-
mfrom:
(6.1.4 sid)
-
Revision ID:
james.westby@ubuntu.com-20101024231248-yemhvmnlrn8d6gi9
Tags: 2.1.0-2ubuntu1
* Merge from Debian unstable (LP: #662883). Remaining changes:
- Install the -dbg build using --install-layout=deb.
* Droppped changes, superseded in Debian:
- The md5 module is deprecated in Python 2.6, use hashlib when possible.
- Explicitly use python2.5 to build the docs; the old doc tools are not
included in python2.6 anymore.