lp://staging/~blueyed/ubuntu/lucid/miro/merge-from-sid

Created by Daniel Hahler and last modified
Get this branch:
bzr branch lp://staging/~blueyed/ubuntu/lucid/miro/merge-from-sid
Only Daniel Hahler can upload to this branch. If you are Daniel Hahler please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Daniel Hahler
Status:
Development

Recent revisions

30. By Daniel Hahler

New upstream: 3.0.1-0ubuntu1

29. By Daniel Hahler

* Merge from Debian unstable (LP: #548389), remaining changes:
  - 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.
  - debian/control, debian/pyversions, debian/README.Debian:
    Build with python 2.6 and xulrunner 1.9.2
* Dropped 90_miro_boost_py26.patch: does not apply anymore.
* New upstream release (Closes: #575463).
   + The xine backend was removed upstream, we use gstreamer only now.
   + Drop (build-)dependency on all Boost packages, no longer used upstream.
   + debian/patches/20_no_autoupdate.patch: Update.
   + debian/patches/30_disable_xine_hack.patch: Drop, obsolete.
   + debian/patches/40_boost_python.patch: Drop, obsolete.
   + debian/patches/80_xine_default_renderer.patch: Drop, obsolete.
* Closing non-reproducible bugs with this release. Please reopen if needed.
   + "No sound when playing videos" (Closes: #527261).
   + "Two internal errors on startup" (Closes: #557347).
   + "Miro "internal error" and odd behavior" (Closes: #574822).
   + "Miro crashes after starts playing a video" (Closes: #522102).
* Standards-Version: 3.8.4 (no changes required).
* debian/miro.docs: Add ADOPTERS file.
* debian/README.Debian: Drop xine related sections.
* debian/rules: Simplified clean target.
* debian/copyright: Updates (Boost and libtorrent stuff is gone).

28. By Daniel Hahler

Merging shared upstream rev into target branch.

27. By Micah Gersten

debian/control: Migrate from xulrunner-1.9.1 to xulrunner-1.9.2

26. By Daniel Hahler

* 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

25. By Bryce Harrington

90_miro_boost_py26.patch: Fix build breakage due to boost dependency
changes.
(LP: #508228)

24. By Bryce Harrington

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.
(LP: #418025)

23. By Bryce Harrington

100_catch_keyerror_in_update_items.patch: Catch exception
caused by out of bounds array index.
(LP: #407575)

22. By Iain Lane

* Merge with Debian unstable, remaining changes:
  - debian/control, debian/pyversions,
    Build with python 2.6 and xulrunner 1.9.1
  - debian/patches/40_boost_python.patch:
    Drop, not needed to build on karmic

21. By Loïc Martin

* Merge from debian unstable (LP: #411110), remaining changes:
  - debian/control: build with python 2.6 and xulrunner 1.9.1

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp://staging/ubuntu/lucid/miro
This branch contains Public information 
Everyone can see this information.

Subscribers