~ubuntu-branches/ubuntu/lucid/scrapbook/lucid

Viewing all changes in revision 10.

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2009-05-20 08:35:23 UTC
  • mfrom: (3.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090520083523-hitr1zxlykkkr3qc
Tags: 1.3.3.9-2ubuntu1
* Merge from debian unstable, 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; set Architecture to all.
    + Packages that Depend/Recommend/Suggest firefox must alternatively
      Depend/Recommend/Suggest abrowser.
    + Adjust the short description, replace IceWeasel occurrences with
      Firefox.
  - Use debian/{install,links}, remove unnecessary dirs file.
  - Update debian/links as we don't use iceweasel.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: