lp:~mitya57/ubuntu/quantal/python-docutils/resync
- Get this branch:
- bzr branch lp:~mitya57/ubuntu/quantal/python-docutils/resync
Branch merges
- Dimitri John Ledkov: Needs Fixing
- Ubuntu branches: Pending requested
-
Diff: 1327 lines (+747/-292)26 files modified.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
.pc/applied-patches (+3/-1)
.pc/disable-DocutilsXMLTestCase.diff/test/test_writers/test_docutils_xml.py (+0/-85)
.pc/fix-docutilsxmltestcase-debian.diff/test/test_writers/test_docutils_xml.py (+107/-0)
.pc/fix-docutilsxmltestcase.diff/test/test_writers/test_docutils_xml.py (+85/-0)
.pc/no-test-skipping.diff/test/test_writers/test_odt.py (+185/-0)
debian/changelog (+72/-1)
debian/control (+6/-16)
debian/copyright (+2/-3)
debian/docutils-common.install (+1/-1)
debian/patches/add-missing-import.diff (+2/-2)
debian/patches/disable-DocutilsXMLTestCase.diff (+0/-90)
debian/patches/fix-docutilsxmltestcase-debian.diff (+26/-0)
debian/patches/fix-docutilsxmltestcase.diff (+62/-0)
debian/patches/fix-error-reporting-encoding-issues.diff (+2/-2)
debian/patches/fix-io-encoding-issues.diff (+2/-2)
debian/patches/no-test-skipping.diff (+17/-0)
debian/patches/series (+3/-1)
debian/patches/testall-no-stdout-stderr-redirect.diff (+1/-1)
debian/python-docutils.postinst (+0/-13)
debian/rst2odt_prepstyles.sgml (+0/-62)
debian/rst2odt_prepstyles.txt (+38/-0)
debian/rules (+15/-12)
test/test_writers/test_docutils_xml.py (+115/-0)
test/test_writers/test_odt.py (+1/-0)
Related bugs
Bug #1038470: Please upload python-docutils 0.8.1-8ubuntu1 | Undecided | Fix Released |
Related blueprints
Branch information
- Owner:
- Dmitry Shachnev
- Status:
- Merged
Recent revisions
- 23. By Dmitry Shachnev
-
Merge lp:ubuntu/python-docutils
This adds missing entry in debian/control and bumps python-all build-dependency
to the required ">= 2.6.6-3~" value - 21. By Dmitry Shachnev
-
* Resynchronize with Debian unstable, remaining change:
- Use dh_python2 instead of dh_pysupport - 19. By Jakub Wilk
-
Rebuild against debhelper (>= 9.20120528) to fix postinst that
unconditionally overwrites files in /etc (see: #477751, closes: #675489).
Thanks to Helmut Grohne for the bug report. - 18. By Jakub Wilk
-
* Fix a typo in a patch description.
* Bump standards version to 3.9.3 (no changes needed).
* Don't mention “Dive Into Python” in python*-roman package descriptions
(closes: #661555). Thanks to Konrad Schöbel for the bug report.
* Remove references to http://diveintopython. org/ from debian/copyright.
* Do not skip tests because of failed imports, as they should never happen.
(no-test-skipping. diff)
* Check only *.py files when looking for unguarded use of __file__.
* Fix paths in the auto-generated manual pages.
* Split section “Usage” into “Synopsis” and “Description” in the manual
pages.
* Fool DocutilsXMLTestCase into thinking that Python version is 2.7.3/3.2.3
when it's in fact 2.7.2/3.2.2 with patched
xml.dom.minidom. Document. toprettyxml( ) method (closes: #645369).
(fix-docutilsxmltest case.diff) . - 17. By Jakub Wilk
-
[ Simon McVittie ]
* Remove myself from Uploaders[ Jakub Wilk ]
* Backport upstream patch to follow the changes in the
xml.dom.minidom. Document. toprettyxml method
(fix-docutilsxmltest case.diff) .
* Drop postinst snippet to deal with a python-support bug (it cannot replace
directory with a regular file). It was needed only for 0.7 upgrades.
* Suggest fonts-linuxlibertine as an alternative to ttf-linux- libertine.
* Update David Goodger's e-mail address in debian/copyright
(closes: #653769). Thanks to Jari Aalto for the bug report.
* Update Subversion repository URLs in patch headers (so that they point to
SourceForge rather than BerliOS).
* Use xargs to iterate over all Python versions.
* Convert rst2odt_prepstyles manpage source from DocBook to
reStructuredText.
+ Remove docbook-to-man from Build-Depends-Indep.
+ Update debian/rules.
* Don't run dh_testroot in the clean target. There's a good chance that root
privileges are not needed (e.g. because binary target was run under
fakeroot), and even if they are actually needed, the target will fail
quickly.
* Drop obsolete virtual package: docutils-writer- manpage (closes: #631066).
* Run tests with --verbose. - 16. By Jakub Wilk
-
* When running the test suite, don't copy stdout and stderr output to a log
file, as this would break under LC_ALL=C, PYTHONWARNING=d and python3.X
(testall-no-stdout- stderr- redirect. diff).
* Use build/py2 and build/py3 for build directories.
* Remove excessive whitespace from debian/control.
* Drop unused virtual package: rst2man.
* Install Python 3 version of rst-buildhtml.
* Fix a typo in rst2xetex manual page. Thanks to Günter Milde for the bug
report.
* Drop unused header file for rst2newlatex manual page.
* Backport upstream patch to add missing import (add-missing-import. diff).
* Backport upstream patches to fix encoding issues with Python 3
(fix-*-encoding- issues. diff). - 15. By Jakub Wilk
-
* Remove needless comments from debian/rules.
* Restore historical behavior of languages.get_language( ) taking only a
single argument (languages-get_language- 2nd-arg- optional. diff). Thanks to
Sergio Talens-Oliag for the bug report. - 14. By Jakub Wilk
-
* Upload to unstable.
* Improve the -doc package:
+ Install CSS files. Correct paths to them in the *.html files.
+ Don't compress *.txt files in the -doc package. Update debian/*.doc-base
accordingly and add lintian override for changelog-file-not- compressed.
+ Don't embed images on remote servers.
* Simplify debian/rules.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/quantal/python-docutils