lp:~andrewsomething/ubuntu/quantal/sphinx/merge1.1.3+dfsg-4

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/quantal/sphinx

Daniel Holbach (community): Approve on 2012-05-29

Ubuntu branches: Pending requested 2012-05-28

Diff: 3125 lines (+159/-2710)

29 files modified

.pc/add_names_to_shorthandoff_helper.patch/sphinx/writers/latex.py (+0/-1511)
.pc/applied-patches (+0/-8)
.pc/disable_distribute_setup.diff/setup.py (+0/-208)
.pc/initialize_autodoc.diff/sphinx/ext/autosummary/generate.py (+0/-319)
.pc/python3_test_build_dir.diff/tests/run.py (+0/-50)
.pc/show_more_stack_frames.diff/sphinx/cmdline.py (+0/-228)
.pc/skiptest_latex.diff/tests/test_build_latex.py (+0/-100)
.pc/sphinxcontrib_namespace.diff/sphinx/__init__.py (+0/-76)
.pc/unversioned_grammar_pickle.diff/sphinx/pycode/pgen2/driver.py (+0/-145)
debian/changelog (+33/-0)
debian/control (+2/-1)
debian/patches/add_names_to_shorthandoff_helper.patch (+0/-25)
debian/patches/disable_distribute_setup.diff (+1/-1)
debian/patches/fix_nepali_po.diff (+31/-0)
debian/patches/fix_shorthandoff.diff (+24/-0)
debian/patches/pygments_byte_strings.diff (+19/-0)
debian/patches/series (+3/-1)
debian/rules (+1/-0)
debian/tests/control (+7/-0)
debian/tests/python-sphinx (+13/-0)
debian/tests/python3-sphinx (+14/-0)
setup.py (+0/-1)
sphinx/__init__.py (+0/-13)
sphinx/cmdline.py (+1/-1)
sphinx/ext/autosummary/generate.py (+0/-10)
sphinx/pycode/pgen2/driver.py (+1/-1)
sphinx/writers/latex.py (+1/-2)
tests/run.py (+2/-2)
tests/test_build_latex.py (+6/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

34. By Andrew Starr-Bochicchio on 2012-05-28

* Merge from Debian unstable. 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.
* Drop add_names_to_shorthandoff_helper.patch, applied in
  Debian as fix_shorthandoff.diff

33. By Melissa Draper on 2012-05-11

debian/patches/add_names_to_shorthandoff_helper.patch: newer versions
of docutils (>=0.8) report full language name rather than shortcodes and
hence breaking pdf compilation in de, sl, pt, es, nl, pl and it locales
as the \shorthandoff directive is not added. Will be fixed in next
upstream release. (LP: #997891)

32. By Scott Kitterman on 2012-03-30

* Finish dh_python2 switch:
  - Drop python-support from build-depends
  - Update version requirement for python in build-depends

31. By Andrew Starr-Bochicchio on 2012-03-27

* 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 on 2012-03-13

debian/rules: export NO_PKG_MANGLE=1 in order to
not have translations stripped (LP: #480913).

29. By Barry Warsaw on 2012-02-21

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 on 2012-02-08

* Merge with Debian sid. (LP: #911124) Remaining Ubuntu delta:
  - Switch to dh_python2.

27. By Jakub Wilk on 2012-02-05

* 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.

26. By Matthias Klose on 2011-12-17

Build using dh_python2

25. By Jakub Wilk on 2011-10-12

Upload to unstable.