~blueyed/ubuntu/lucid/miro/merge-from-sid

Viewing all changes in revision 26.

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Hahler
  • Date: 2010-02-20 02:34:26 UTC
  • mfrom: (1.2.9 upstream) (1.5.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100220023426-779i9mv2gk8w84ui
Tags: 2.5.4-1ubuntu1
* Merge with Debian unstable, remaining changes: 
  - debian/patches/40_boost_python.patch:
    Drop, not needed to build on karmic
  - 100_catch_keyerror_in_update_items.patch: Catch exception
    caused by out of bounds array index.
  - 101_player_undefined_elapsed_time.patch: There are some cases 
    where the elapsed_time returned is undefined; use a current 
    time of 0 in this case when fast-forwarding.
  - 90_miro_boost_py26.patch: Fix build breakage due to boost dependency
    changes.
  - debian/control, debian/pyversions,
    Build with python 2.6 and xulrunner 1.9.1

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: