* Merge with Debian. Remaining Ubuntu changes: + Build for Python 3. + debian/rules: - Run the test suite during build + Convert to dh_python2. * Drop debian/patches/broken-tests.patch and d/p/CVE-2012-2921.patch since both have been applied upstream by 5.1.2 * Drop Build-Depends on python-chardet, python-libxml2, and python-utidylib as these cause test suite failures. Now the Python 2 build dependencies match the Python 3 build dependencies. (LP: #1056820)