~ubuntu-branches/ubuntu/maverick/mplayerplug-in/maverick

Viewing all changes in revision 28.

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2009-06-13 18:02:40 UTC
  • mfrom: (3.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090613180240-6xsmyxjb156ifs4r
Tags: 3.55-2ubuntu1
* Merge from debian unstable, remaining changes: LP: #386705
  - debian/control:
    + add Xb-Npp-xxx tags accordingly to "firefox distro add-on support"
      spec.
    + replace build-depends on iceape-dev with libxul-dev.
    + replace iceweasel with firefox-3.0 | xulrunner.
    + replace iceape-browser with seamonkey-browser.
    + add alternative depends on mplayer-nogui (>= 1.0~rc2).
    + tighten mplayer dependency to (>= 1.0~rc2).
  - debian/mozilla-mplayer.links:
    + add firefox and xulrunner symlinks.
* Fixes: LP: #239506 LP: #376932 LP: #360756 LP: #360222 (Hopefully).

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: