-
Committer:
Bazaar Package Importer
-
Author(s):
Nick Ellery
-
Date:
2008-12-22 19:12:22 UTC
-
mfrom:
(3.1.2 lenny)
-
Revision ID:
james.westby@ubuntu.com-20081222191222-qw4rv5k8hwh2b7qb
Tags: 3.55-1.1ubuntu1
* Merge from debian unstable, remaining changes (LP: #310785):
- 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.
* Drop alternative dependency on firefox-2, package not Jaunty (LP: #272959).