lp:~andrewsomething/ubuntu/precise/sphinx/1.1.3+dfsg-2ubuntu1
- Get this branch:
- bzr branch lp:~andrewsomething/ubuntu/precise/sphinx/1.1.3+dfsg-2ubuntu1
Branch merges
- Didier Roche-Tolomelli: Approve
- Ubuntu branches: Pending requested
-
Diff: 2803 lines (+512/-1186)59 files modified.pc/applied-patches (+0/-5)
.pc/disable_distribute_setup.diff/setup.py (+0/-208)
.pc/initialize_autodoc.diff/sphinx/ext/autosummary/generate.py (+0/-319)
.pc/show_more_stack_frames.diff/sphinx/cmdline.py (+0/-228)
.pc/sphinxcontrib_namespace.diff/sphinx/__init__.py (+0/-76)
.pc/unversioned_grammar_pickle.diff/sphinx/pycode/pgen2/driver.py (+0/-145)
CHANGES (+58/-0)
PKG-INFO (+2/-2)
Sphinx.egg-info/PKG-INFO (+2/-2)
debian/changelog (+53/-1)
debian/control (+11/-9)
debian/jstest/run-tests (+4/-4)
debian/patches/python3_test_build_dir.diff (+23/-0)
debian/patches/series (+2/-0)
debian/patches/skiptest_latex.diff (+42/-0)
debian/rules (+5/-4)
doc/ext/math.rst (+4/-0)
doc/markup/misc.rst (+7/-0)
setup.cfg (+13/-13)
setup.py (+0/-1)
sphinx/__init__.py (+2/-15)
sphinx/apidoc.py (+9/-6)
sphinx/builders/changes.py (+7/-4)
sphinx/builders/html.py (+5/-2)
sphinx/builders/htmlhelp.py (+29/-18)
sphinx/builders/qthelp.py (+25/-24)
sphinx/cmdline.py (+4/-4)
sphinx/config.py (+3/-2)
sphinx/domains/cpp.py (+2/-2)
sphinx/domains/python.py (+19/-17)
sphinx/domains/std.py (+6/-1)
sphinx/environment.py (+33/-12)
sphinx/ext/autodoc.py (+7/-3)
sphinx/ext/autosummary/generate.py (+0/-10)
sphinx/ext/doctest.py (+12/-2)
sphinx/ext/inheritance_diagram.py (+2/-1)
sphinx/ext/intersphinx.py (+7/-1)
sphinx/highlighting.py (+6/-4)
sphinx/locale/fr/LC_MESSAGES/sphinx.po (+4/-10)
sphinx/pycode/pgen2/driver.py (+1/-1)
sphinx/setup_command.py (+3/-0)
sphinx/texinputs/sphinx.sty (+6/-9)
sphinx/texinputs/sphinxhowto.cls (+11/-0)
sphinx/texinputs/sphinxmanual.cls (+11/-0)
sphinx/themes/basic/static/basic.css_t (+2/-2)
sphinx/util/__init__.py (+2/-1)
sphinx/util/inspect.py (+5/-0)
sphinx/util/nodes.py (+4/-0)
sphinx/util/osutil.py (+6/-1)
sphinx/util/pycompat.py (+5/-0)
sphinx/websupport/__init__.py (+2/-2)
sphinx/websupport/storage/differ.py (+3/-2)
sphinx/websupport/storage/sqlalchemy_db.py (+18/-4)
sphinx/writers/html.py (+7/-1)
sphinx/writers/latex.py (+2/-1)
tests/run.py (+5/-3)
tests/test_build_html.py (+6/-2)
tests/test_intersphinx.py (+3/-0)
tests/test_quickstart.py (+2/-2)
Branch information
- Owner:
- Andrew Starr-Bochicchio
- Status:
- Development
Recent revisions
- 31. By Andrew Starr-Bochicchio
-
* Merge from Debian Testing. Remaining Ubuntu changes:
- Switch to dh_python2.
- debian/rules: export NO_PKG_MANGLE=1 in order to
not have translations stripped.
- debian/control: Drop the dependency on python-whoosh. - 30. By Andrew Starr-Bochicchio
-
debian/rules: export NO_PKG_MANGLE=1 in order to
not have translations stripped (LP: #480913). - 29. By Barry Warsaw
-
Drop the dependency on python-whoosh. The latter is in universe
but the upstream Sphinx maintainer confirms it's only necessary for
experimental features. - 28. By Barry Warsaw
-
* Merge with Debian sid. (LP: #911124) Remaining Ubuntu delta:
- Switch to dh_python2. - 27. By Jakub Wilk
-
* Make the build actually fail if integration tests for the JavaScript
code fail.
* Don't remove *.egg-info in the clean target; add it to extend-diff-ignore
instead.
* Pass --no-guessing-deps to dh_python3. - 24. By Jakub Wilk
-
* JavaScript test suite: don't hang if get_title() returns None. Thanks to
Ansgar Burchardt for the bug report.
* dh_sphinxdoc:
+ Fix a typo in the manual page.
+ Don't check for existence of source files if HAS_SOURCE is false
(closes: #641710). Thanks to Raphaƫl Hertzog for the bug report.
* Disable use of ez_setup in setup.py.
* Set myself as maintainer. Thanks to Mikhail Gusarov for his past work! - 23. By Jakub Wilk
-
* Strip jQuery and Underscore.js from the upstream tarball (closes:
#631535).
+ Add get-orig-source target.
+ Remove them from debian/copyright.
+ Add build-dependency on libjs-underscore,
+ Update watch file to deal with the +dfsg suffix.
* Unify multiple calls to dh_link.
* Use build/html as build directory for documentation.
* Add integration tests for the JavaScript code. They should allow us to
avoid bugs like #625208 or #628642 in the future.
+ Build-depend on xvfb, xauth, python-webkit, libjs-jquery and
libjs-underscore.
* Add build-arch and build-indep targets to debian/rules.
* Add new tool, dh_sphinxdoc that aids shipping Sphinx-generated
documentation in Debian packages.
+ Update debian/rules, debian/control and debian/*.links to use
dh_sphinxdoc.
+ Use pod2man to generate manpage. Add dependency on perl. Update
debian/manpages and debian/clean.
* Move all JavaScript code into a separate package, libjs-sphinxdoc.
* Fix test_build_latex to not fail in a directory with special characters.
* Use debian/clean rather than listing files to clean directly in
debian/rules. - 22. By Jakub Wilk
-
[ Jakub Wilk ]
* Bump standards version to 3.9.2 (no changes needed).
* Bump minimum required version of jQuery to 1.4.
* Use python (>= 2.6.6-14~) as an alternative build-dependency to
python-simplejson. The latter package is only needed for python2.5, and
python-defaults 2.6.6-14 doesn't support it anymore.
* Include jQuery source (closes: #630973).
+ Check at build time if versions of both jQuery copies match.[ Nikolaus Rath ]
* Backport upstream changesets a8b0ef275438 and de340a6098c7 to allow
extraction of function signature from docstring for extension modules.
(closes: #630409). The feature is disabled by default for the moment.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/precise/sphinx