~ubuntu-branches/ubuntu/raring/sphinx/raring

Viewing all changes in revision 39.

  • Committer: Package Import Robot
  • Author(s): Dmitry Shachnev
  • Date: 2012-11-27 19:20:44 UTC
  • mfrom: (5.2.17 experimental)
  • Revision ID: package-import@ubuntu.com-20121127192044-nni46k0fx6qejgqs
Tags: 1.1.3+dfsg-5ubuntu1
* 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.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: