Please merge bzr 2.6.0~bzr6571-4/experimental

I'm afraid it fails to build for me in raring amd64:
python tools/generate_release_notes.py doc/en/release-notes/index.txt doc/en/release-notes/bzr-0.1.txt doc/en/release-notes/bzr-0.10.txt doc/en/release-notes/bzr-0.11.txt doc/en/release-notes/bzr-0.12.txt doc/en/release-notes/bzr-0.13.txt doc/en/release-notes/bzr-0.14.txt doc/en/release-notes/bzr-0.15.txt doc/en/release-notes/bzr-0.16.txt doc/en/release-notes/bzr-0.17.txt doc/en/release-notes/bzr-0.18.txt doc/en/release-notes/bzr-0.6.txt doc/en/release-notes/bzr-0.7.txt doc/en/release-notes/bzr-0.8.txt doc/en/release-notes/bzr-0.9.txt doc/en/release-notes/bzr-0.90.txt doc/en/release-notes/bzr-0.91.txt doc/en/release-notes/bzr-0.92.txt doc/en/release-notes/bzr-1.0.txt doc/en/release-notes/bzr-1.1.txt doc/en/release-notes/bzr-1.10.txt doc/en/release-notes/bzr-1.11.txt doc/en/release-notes/bzr-1.12.txt doc/en/release-notes/bzr-1.13.txt doc/en/release-notes/bzr-1.14.txt doc/en/release-notes/bzr-1.15.txt doc/en/release-notes/bzr-1.16.txt doc/en/release-notes/bzr-1.17.txt doc/en/release-notes/bzr-1.18.txt doc/en/release-notes/bzr-1.2.txt doc/en/release-notes/bzr-1.3.txt doc/en/release-notes/bzr-1.4.txt doc/en/release-notes/bzr-1.5.txt doc/en/release-notes/bzr-1.6.txt doc/en/release-notes/bzr-1.7.txt doc/en/release-notes/bzr-1.8.txt doc/en/release-notes/bzr-1.9.txt doc/en/release-notes/bzr-2.0.txt doc/en/release-notes/bzr-2.1.txt doc/en/release-notes/bzr-2.2.txt doc/en/release-notes/bzr-2.3.txt doc/en/release-notes/bzr-2.4.txt doc/en/release-notes/bzr-2.5.txt doc/en/release-notes/bzr-2.6.txt
python tools/generate_docs.py -o doc/en/user-reference/index.txt rstx
bzr: warning: some compiled extensions could not be loaded; see <https://answers.launchpad.net/bzr/+faq/703>
Traceback (most recent call last):
  File "tools/generate_docs.py", line 111, in <module>
    main(sys.argv)
  File "tools/generate_docs.py", line 97, in main
    infogen_mod.infogen(options, outfile)
  File "bzrlib/doc_generate/autodoc_rstx.py", line 56, in infogen
    outfile.write(_get_body(params, topic_dir))
  File "bzrlib/doc_generate/autodoc_rstx.py", line 68, in _get_body
    output_dir=topic_dir))
  File "bzrlib/doc_generate/autodoc_rstx.py", line 95, in _get_section
    topic_id = _dump_text(output_dir, topic, help)
  File "bzrlib/doc_generate/autodoc_rstx.py", line 134, in _dump_text
    f.writelines(text)
TypeError: writelines() argument must be a sequence of strings
make[2]: *** [doc/en/user-reference/index.txt] Error 1
make[2]: Leaving directory `/tmp/buildd/bzr-2.6.0~bzr6571'
make[1]: *** [override_dh_auto_build] Error 2
make[1]: Leaving directory `/tmp/buildd/bzr-2.6.0~bzr6571'
make: *** [build] Error 2
dpkg-buildpackage: error: debian/rules build gave error exit status 2

What environment are you building in?

Freshly successful raaring PPA builds for both i386 and amd64:

https://launchpad.net/~andrewsomething/+archive/experimental/+build/4225654
https://launchpad.net/~andrewsomething/+archive/experimental/+build/4225653

diffs updated to include 2.6.0~bzr6571-4 which is an upload just to include the un-coordinated upload of 2.6.0~bzr6571-1ubuntu2

The updated merge also successfully builds in a raring PPA:

https://launchpad.net/~andrewsomething/+archive/experimental/+build/4230513
https://launchpad.net/~andrewsomething/+archive/experimental/+build/4230514

Uploaded with a bug closure for this bug. Thanks!

This bug was fixed in the package bzr - 2.6.0~bzr6571-4ubuntu1

---------------
bzr (2.6.0~bzr6571-4ubuntu1) raring; urgency=low

  * Merge from Debian experimental (LP: #1097100). Remaining Ubuntu changes:
   - Drop build dependencies on python-{meliae,lzma,medusa},
     which are not in main.
   - Adjust Vcs field in debian/control for Ubuntu.
  * Drop 04_apport_bytesio and 05_tcp_serve_localhost, they are
    not used in Debian and it seems to build fine without them.

bzr (2.6.0~bzr6571-4) experimental; urgency=low

  * debian/tests/control: Add python-subunit to autopkgtest
    dependencies (LP: #1101206).

bzr (2.6.0~bzr6571-3) experimental; urgency=low

  * debian/rules: Don't call dh_sphinxdoc if doc package is
    not being built. Fixes FTBFS on buildds where arch:all
    packages are not built.

bzr (2.6.0~bzr6571-2) experimental; urgency=low

  * Add myself to uploaders.
  * Fix Vcs-Bzr link and add Vcs-Browser field.
  * Run wrap-and-sort over the debian/control file and install files.
  * Bump debian/compat to 9.
  * Build Sphinx-based docs rather than the plain html ones.
    The fixes a number of outstanding doc related bugs:
   - Closes: #670526, #606009
   - LP: #544149, LP: #1014572, LP: #514609
 -- Andrew Starr-Bochicchio <email address hidden> Mon, 07 Jan 2013 20:02:12 -0500