Viewing all changes in revision 9.
- Committer: Bazaar Package Importer
- Date: 2009-02-23 08:43:03 UTC
- mfrom: (1.1.4 upstream) (3.1.2 squeeze)
- Revision ID: james.westby@ubuntu.com-20090223084303-4e78bb83ihdvvcll
* Merge from debian unstable (LP: #333183), Ubuntu remaining changes:
- debian/control:
+ Rename binary package to "scrapbook".
+ Add a transitional package (iceweasel-scrapbook -> scrapbook),
and a Conflicts to scrapbook against older iceweasel-scrapbook
installations; set Architecture to all.
+ Update the short description (s/IceWeasel/Firefox).
+ Packages that Depend/Recommend/Suggest firefox must alternatively
Depend/Recommend/Suggest abrowser.
- Use debian/{install,links} and remove unnecessary debian dirs file.
- Update debian/links as we don't use iceweasel.
- debian/control:
+ Rename binary package to "scrapbook".
+ Add a transitional package (iceweasel-scrapbook -> scrapbook),
and a Conflicts to scrapbook against older iceweasel-scrapbook
installations; set Architecture to all.
+ Update the short description (s/IceWeasel/Firefox).
+ Packages that Depend/Recommend/Suggest firefox must alternatively
Depend/Recommend/Suggest abrowser.
- Use debian/{install,links} and remove unnecessary debian dirs file.
- Update debian/links as we don't use iceweasel.
expand all
collapse all
added
removed
