Branches for Natty

Author: James McCoy
Revision Date: 2009-06-23 14:25:44 UTC

* debian/watch: Add dversionmangle to remove '.ds' from upstream version.
* debian/copyright:
  - Remove license information about files which are removed as part of
    repacking the tarball.
  - Update the location of the convertcore.py file.
* debian/rules:
  - Include /usr/share/python/python.mk.
  - Use $(py_setup_install_args) when running setup.py install.
* Cherry-pick fix from upstream so the Google plugin can still find the
  simplejson module when both python-simplejson and python-json are
  installed. (Closes: #533650)