* Merge from Debian unstable. Remaining Ubuntu changes: - debian/control + replace iceweasel with firefox3.0 | firefox 2 + replace iceape-browser with seamonkey-browser + add Depends on | mplayer-nogui (>= 1.0~rc2) + add Xb-Npp-xxx tags accordingly to "firefox distro add-on support" spec + Modify Maintainer value to match the DebianMaintainerField specification. - debian/mozilla-mplayer.links: + add firefox and xulrunner symlinks * Replace iceape-dev b-d with libxul-dev. * Add xulrunner in lists of possible "browsers". * Following upstream suggestion, change required mplayer version to be (>= 1.0~rc2).