~ubuntu-branches/ubuntu/lucid/xdelta3/lucid

Viewing all changes in revision 6.

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2009-07-19 14:20:41 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20090719142041-mh9nfrkhp0yjzjde
Tags: 0v2.dfsg-1ubuntu1
* Merge from debian unstable (LP: #401314), remaining changes:
  - Change debian rules to build the Python binary using the new
    setup.py install --install-layout=deb for Python 2.6 and dist-packages
  - Remove debian/python-xdelta3.dir so we don't pick up a hard coded
    depends on python2.4 (and it's not actually needed anyway)
  - Change shebang in Python example scripts to #!/usr/bin/python so the
    package does not pick up direct dependencies on python2.4 and python2.5

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: