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

Viewing all changes in revision 34.

  • Committer: Andrew Starr-Bochicchio
  • Date: 2012-05-28 14:51:25 UTC
  • mfrom: (5.3.13 sid)
  • Revision ID: a.starr.b@gmail.com-20120528145125-lvl835emq85l3qe7
* 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

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: