-
Committer:
Bazaar Package Importer
-
Author(s):
Bhavani Shankar
-
Date:
2008-12-11 13:21:50 UTC
-
mfrom:
(1.1.3 upstream)
(3.1.1 lenny)
-
Revision ID:
james.westby@ubuntu.com-20081211132150-nv3un2spwv0udrqt
Tags: 1.3.3.4-1ubuntu1
* Merge from debian unstable, remaining changes: (LP: #254649)
- debian/control:
+ Rename binary package to "scrapbook".
+ Change "Iceweasel" to "Firefox" in the short description.
+ Add a transitional package (iceweasel-scrapbook -> scrapbook),
and a Conflicts to scrapbook against older iceweasel-scrapbook
installations.
- Remove the "iceweasel-scrapbook." prefix from file names.
- Change paths in debian/install, debian/links and debian/dirs
- Change iceweasel-scrapbook transitional package's arch to all
- packages that Depend/Recommend/Suggest firefox
(meta-package) must alternatively Depend/Recommend/Suggest abrowser
* Updated alternative dependency to firefox-3.0. (LP: #272959)
* Remove usr/share/scrapbook,/usr/lib/iceweasel/extensions/
{53A03D43-5363-4669-8190-99061B2DEBA5}
from debian/links as we arent shipping iceweasel.