Please merge bzr 2.6.0~bzr6571-4/experimental
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
bzr (Ubuntu) |
Fix Released
|
Wishlist
|
Unassigned |
Bug Description
The bzr import from experimental is out of date, so I can't use bzr to merge bzr.
bzr (2.6.0~
* Merge from Debian experimental. Remaining Ubuntu changes:
- Drop build dependencies on python-
which are not in main.
- Adjust Vcs field in debian/control for Ubuntu.
* Drop 04_apport_bytesio and 05_tcp_
not used in Debian and it seems to build fine without them.
-- Andrew Starr-Bochicchio <email address hidden> Mon, 07 Jan 2013 20:02:12 -0500
bzr (2.6.0~bzr6571-4) experimental; urgency=low
* debian/
dependencies (LP: #1101206).
-- Andrew Starr-Bochicchio <email address hidden> Fri, 18 Jan 2013 18:41:31 -0500
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.
-- Andrew Starr-Bochicchio <email address hidden> Tue, 08 Jan 2013 20:02:55 -0500
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> Sun, 06 Jan 2013 19:20:39 -0500
A "dropped" change that isn't in the changelog is:
Drop 06_new_zlib patch and add build-conflicts for newer versions of zlib.
That was actually done in Debian awhile back. It seems as if the line in the changelog for the last Ubuntu upload was just cargo-culted.
Changed in bzr (Ubuntu): | |
status: | Confirmed → In Progress |
assignee: | nobody → Andrew Starr-Bochicchio (andrewsomething) |
description: | updated |
description: | updated |
tags: | added: patch |
summary: |
- Please merge bzr 2.6.0~bzr6571-2/experimental + Please merge bzr 2.6.0~bzr6571-3/experimental |
description: | updated |
Changed in bzr (Ubuntu): | |
status: | In Progress → Confirmed |
assignee: | Andrew Starr-Bochicchio (andrewsomething) → nobody |
I'm afraid it fails to build for me in raring amd64: 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 docs.py -o doc/en/ user-reference/ index.txt rstx /answers. launchpad. net/bzr/ +faq/703> generate_ docs.py" , line 111, in <module> generate_ docs.py" , line 97, in main mod.infogen( options, outfile) doc_generate/ autodoc_ rstx.py" , line 56, in infogen write(_ get_body( params, topic_dir)) doc_generate/ autodoc_ rstx.py" , line 68, in _get_body dir=topic_ dir)) doc_generate/ autodoc_ rstx.py" , line 95, in _get_section output_ dir, topic, help) doc_generate/ autodoc_ rstx.py" , line 134, in _dump_text s(text) user-reference/ index.txt] Error 1 bzr-2.6. 0~bzr6571' dh_auto_ build] Error 2 bzr-2.6. 0~bzr6571'
python tools/generate_
python tools/generate_
bzr: warning: some compiled extensions could not be loaded; see <https:/
Traceback (most recent call last):
File "tools/
main(sys.argv)
File "tools/
infogen_
File "bzrlib/
outfile.
File "bzrlib/
output_
File "bzrlib/
topic_id = _dump_text(
File "bzrlib/
f.writeline
TypeError: writelines() argument must be a sequence of strings
make[2]: *** [doc/en/
make[2]: Leaving directory `/tmp/buildd/
make[1]: *** [override_
make[1]: Leaving directory `/tmp/buildd/
make: *** [build] Error 2
dpkg-buildpackage: error: debian/rules build gave error exit status 2