* Merge from debian testing, Ubuntu remaining changes: - debian/control: + Set binary package name to scrapbook. + Add a transitional package (iceweasel-scrapbook -> scrapbook), and a Conflicts to scrapbook against older iceweasel-scrapbook installations. + Packages that Depend/Recommend/Suggest firefox must alternatively Depend/Recommend/Suggest abrowser. + Adjust the short description, replace IceWeasel occurrences with Firefox.