lp:~mitya57/ubuntu/raring/sphinx/1.1.3+dfsg-5ubuntu1
- Get this branch:
- bzr branch lp:~mitya57/ubuntu/raring/sphinx/1.1.3+dfsg-5ubuntu1
Branch merges
- Daniel Holbach (community): Approve
- Ubuntu branches: Pending requested
-
Diff: 5032 lines (+2599/-2162)22 files modified.pc/applied-patches (+3/-0)
.pc/fix_manpages_generation_with_new_docutils.diff/sphinx/writers/manpage.py (+0/-345)
.pc/l10n_fixes.diff/sphinx/environment.py (+1762/-0)
.pc/sort_stopwords.diff/sphinx/search/__init__.py (+287/-0)
.pc/support_python_3.3.diff/sphinx/environment.py (+0/-1762)
.pc/test_build_html_rb.diff/tests/test_build_html.py (+339/-0)
debian/changelog (+58/-0)
debian/control (+3/-3)
debian/dh-sphinxdoc/dh_sphinxdoc (+4/-2)
debian/patches/l10n_fixes.diff (+58/-0)
debian/patches/series (+3/-0)
debian/patches/sort_stopwords.diff (+16/-0)
debian/patches/support_python_3.3.diff (+11/-35)
debian/patches/test_build_html_rb.diff (+17/-0)
debian/rules (+3/-2)
debian/sphinx-autogen.1 (+1/-1)
debian/tests/control (+0/-2)
debian/tests/python-sphinx (+1/-1)
debian/tests/python3-sphinx (+1/-1)
sphinx/environment.py (+30/-6)
sphinx/search/__init__.py (+1/-1)
tests/test_build_html.py (+1/-1)
Related bugs
Related blueprints
Branch information
- Owner:
- Dmitry Shachnev
- Status:
- Merged
Recent revisions
- 27. By Dmitry Shachnev
-
* Merge with Debian packaging SVN.
- This brings in fix for LP: #1068493.
* Remaining Ubuntu changes:
- Switch to dh_python2.
- debian/rules: export NO_PKG_MANGLE=1 in order to not have translations
stripped.
- debian/rules: Modify xvfb-run to use auto-servernum flag (fixes FTBFS).
- debian/control: Drop the dependency on python-whoosh.
- debian/control: Add "XS-Testsuite: autopkgtest" header.
- debian/patches/ fix_manpages_ generation_ with_new_ docutils. diff:
Fix FTBFS with the new python-docutils package. - 26. By Dmitry Shachnev
-
Update to SVN r23088.
[ Jakub Wilk ]
* DEP-8 tests: remove “Features: no-build-needed”; it's the default now.
* Bump standards version to 3.9.4; no changes needed.[ Dmitry Shachnev ]
* debian/patches/ l10n_fixes. diff: fix crashes and not working external
links in l10n mode (closes: #691719). - 25. By Jakub Wilk
-
[ Jakub Wilk ]
* DEP-8 tests: use $ADTTMP.
* dh_sphinxdoc: ignore comments when analysing HTML files (closes: #682850).
Thanks to Dmitry Shachnev for the bug report.
* Add dvipng to Suggests (closes: #687273). Thanks to Matthias Klose for the
bug report.
* Set PYTHONHASHSEED=random in debian/rules and in DEP-8 tests.
* Backport upstream patch to fix encoding issues in test_build_html. Now
that this is fixed, stop running Python 3 tests under LC_ALL=C.
* Make “debian/rules binary-arch” no-op.
* Update version number in the sphinx-autogen manpage.
* Improve dh_sphinxdoc:
+ Fix the --tmpdir option. Thanks to Andriy Senkovych for the bug report.
+ Ignore references to JavaScript code that start with an URI scheme.
Thanks to Dmitry Shachnev for the bug report.
+ Strip query (?...) and fragment (#...) components from JavaScript
references. Thanks to Dmitry Shachnev for the bug report.
* Sort stopwords in searchtools.js. Thanks to Dmitry Shachnev for the bug
report.
* Fix compatibility with Python 3.3. Thanks to Dmitry Shachnev for the bug
report and hunting down the upstream patch.[ Dmitry Shachnev ]
* Update Homepage field to point to http://sphinx- doc.org/.
* Build-depend of python3-all instead of python3. - 24. By Jakub Wilk
-
* New upstream release.
+ Drop python3_test_syspath. diff, applied upstream.
+ Update integration tests for the JavaScript code.
* Bump standards version to 3.9.3 (no changes needed). - 23. By Jakub Wilk
-
* Add sphinxcontrib_
namespace. diff: create namespace package
‘sphinxcontrib’. This allows python-sphinxcontrib. * packages, both those
using dh_python2 and those using python-support, to be co-importable.
* Add various texlive-* and libjs-mathjax to Suggests.
* Don't install SOURCES.txt into binary packages.
* dh_sphinxdoc: produce different diagnostic message when unknown JavaScript
script is being ignored than when it's a fatal error. Thanks to Sandro
Tosi for the bug report.
* Make the get-orig-source script create temporary files in /tmp (or
$TMPDIR).
* Revert all the changes to manual pages that accumulated over the years.
* Document that symlinking translations.js and non-English searchtools.js is
not supported (see bug #658238).
* Don't include websupport.js in libjs-jquery. Make dh_sphinxdoc remove this
file from binary package.
* dh_sphinxdoc: -X<item> should now exclude a file if <item> exists anywhere
in the path, so it can be used e.g. to exclude whole directories.
* Fix a typo in dh_sphinxdoc manual page. - 22. By Jakub Wilk
-
* New upstream release (closes: #649048).
+ Drop autosummary_1.0.6.patch for the time being (reopens: #611078).
+ Drop docstring_parse.diff, applied upstream.
+ Rename disable_ez_setup. diff to disable_ distribute_ setup.diff.
+ Drop move_static_files_outside_ site-packages. patch. Most of it was
applied upstream, the remaining bits are now taken care of in
debian/rules.
+ Refresh other patches.
+ Update integration tests for the JavaScript code.
+ Bump minimum required versions:
- python-docutils to >= 0.7;
- python-pygments to >= 1.2;
- python-jinja2 to >= 2.3.
- python to >= 2.5.
+ Add code to install also JavaScript files that are generated at build
time. Add websupport.js to dh_sphinxdoc index.
+ Update debian/copyright.
* Texinfo output format is now supported (closes: #586747).
* Update version numbers in the manual pages. Add a build-time warning to be
emitted if they ever get out of date again.
* Build manual pages (except for sphinx-autogen.1) from reStructuredText
sources.
* Rephrase short package description, so that it's... shorter.
* New binary package: sphinx-common, containing manual pages, templates,
translations and other data files.
* New binary package: sphinx-doc, containing documentation.
+ Conflict with previous versions python-sphinx.
+ /usr/share/doc/python- sphinx/ html used to be a directory, but is now a
symlink. Conflict with older versions of python-docutils, so that dpkg
can replace one with the other. Add lintian override.
* New binary package: python3-sphinx.
+ Both python-sphinx and python3-sphinx provide sphinx-* scripts. The
scripts have:
#!/usr/bin/ python3 shebang if only python3-sphinx is installed;
#!/usr/bin/ python shebang otherwise.
+ /usr/bin/sphinx-* are now symlinks and are managed by docutils-common
postinst/postrm maintainer scripts.
+ Make sphinx-common conflict with older versions of python-sphinx that
were shipping /usr/bin/sphinx-* scripts. Add lintian override for
conflicts-with-version.
+ Add build-dependency on python3 (needed for dh_python3) and
python3-setuptools.
+ Add X-Python3-Version field.
* Improve debian/rules:
+ Run dh_install with --fail-missing.
+ Make the build actually fail if integration tests for the JavaScript
code fail.
+ Refactor the code responsible for moving data into a private directory.
Rename some variables to make them lowercase. Don't use CURDIR where
it's not necessary.
+ Make it possible to rebuild the package without running clean target.
+ Remove unneeded mkdir calls.
+ Use a for loop in debian/rules to install all sphinx-* scripts.
+ Run nosetests with --verbose --no-skip.
* Add build-dependency on the following packages (needed for the test
suite): python-sqlalchemy, python-whoosh, python-xapian.
* Use XS-Python-Version instead of debian/pyversions. - 21. By Jakub Wilk
-
* New upstream release.
+ Drop fix_jquery_1.5_incompatibi lity.diff, applied upstream.
+ Drop fix_test_build_latex. diff, applied upstream.
+ Refresh other patches.
* Export PYTHONWARNINGS=d in debian/rules to enable all warnings in Python
code. - 20. By Jakub Wilk
-
[ Mikhail Gusarov ]
* Change my email address.[ Jakub Wilk ]
* Stop embedding Python version in filename of grammar pickle.
* Ship grammar pickle in the binary package (closes: #613412). Thanks to
Frederic-Emmanuel Picca for the bug report.
* Drop preinst script to remove python-central leftovers; not needed
anymore.
* Revert changes to the autosummary extension introduced in 1.0.7
(closes: #611078). - 19. By Jakub Wilk
-
* New upstream release.
+ Refresh patches.
+ Add texlive-{latex- {recommended, extra}, fonts-recommend ed} to
Build-Depends- Indep, so that tests for LaTeX output can be run.
* Move pycode/Grammar.txt and ext/autosummary/templates/ * out of
/usr/share/pyshared/ (closes: #609486).
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/raring/sphinx