Viewing all changes in revision 11.
- Committer: Bazaar Package Importer
- Date: 2009-11-08 13:04:00 UTC
- mfrom: (1.1.5 upstream) (3.1.4 sid)
- Revision ID: james.westby@ubuntu.com-20091108130400-qjinjbtq655eflpz
* 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.
  - 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.
- files added:
- chrome/scrapbook.jar!
- chrome/scrapbook.jar!/content
- chrome/scrapbook.jar!/content/scrapbook
- chrome/scrapbook.jar!/locale
- chrome/scrapbook.jar!/locale/ar
- chrome/scrapbook.jar!/locale/ar/scrapbook
- chrome/scrapbook.jar!/locale/ca-AD
- chrome/scrapbook.jar!/locale/ca-AD/scrapbook
- chrome/scrapbook.jar!/locale/cs-CZ
- chrome/scrapbook.jar!/locale/cs-CZ/scrapbook
- chrome/scrapbook.jar!/locale/de-DE
- chrome/scrapbook.jar!/locale/de-DE/scrapbook
- chrome/scrapbook.jar!/locale/en-US
- chrome/scrapbook.jar!/locale/en-US/scrapbook
- chrome/scrapbook.jar!/locale/es-ES
- chrome/scrapbook.jar!/locale/es-ES/scrapbook
- chrome/scrapbook.jar!/locale/fi-FI
- chrome/scrapbook.jar!/locale/fi-FI/scrapbook
- chrome/scrapbook.jar!/locale/fr-FR
- chrome/scrapbook.jar!/locale/fr-FR/scrapbook
- chrome/scrapbook.jar!/locale/ga-IE
- chrome/scrapbook.jar!/locale/ga-IE/scrapbook
- chrome/scrapbook.jar!/locale/gl-ES
- chrome/scrapbook.jar!/locale/gl-ES/scrapbook
- chrome/scrapbook.jar!/locale/hr-HR
- chrome/scrapbook.jar!/locale/hr-HR/scrapbook
- chrome/scrapbook.jar!/locale/hu-HU
- chrome/scrapbook.jar!/locale/hu-HU/scrapbook
- chrome/scrapbook.jar!/locale/it-IT
- chrome/scrapbook.jar!/locale/it-IT/scrapbook
- chrome/scrapbook.jar!/locale/ja-JP
- chrome/scrapbook.jar!/locale/ja-JP/scrapbook
- chrome/scrapbook.jar!/locale/ko-KR
- chrome/scrapbook.jar!/locale/ko-KR/scrapbook
- chrome/scrapbook.jar!/locale/nl-NL
- chrome/scrapbook.jar!/locale/nl-NL/scrapbook
- chrome/scrapbook.jar!/locale/pl-PL
- chrome/scrapbook.jar!/locale/pl-PL/scrapbook
- chrome/scrapbook.jar!/locale/pt-BR
- chrome/scrapbook.jar!/locale/pt-BR/scrapbook
- chrome/scrapbook.jar!/locale/ro-RO
- chrome/scrapbook.jar!/locale/ro-RO/scrapbook
- chrome/scrapbook.jar!/locale/ru-RU
- chrome/scrapbook.jar!/locale/ru-RU/scrapbook
- chrome/scrapbook.jar!/locale/sk-SK
- chrome/scrapbook.jar!/locale/sk-SK/scrapbook
- chrome/scrapbook.jar!/locale/sv-SE
- chrome/scrapbook.jar!/locale/sv-SE/scrapbook
- chrome/scrapbook.jar!/locale/tr-TR
- chrome/scrapbook.jar!/locale/tr-TR/scrapbook
- chrome/scrapbook.jar!/locale/uk-UA
- chrome/scrapbook.jar!/locale/uk-UA/scrapbook
- chrome/scrapbook.jar!/locale/zh-CN
- chrome/scrapbook.jar!/locale/zh-CN/scrapbook
- chrome/scrapbook.jar!/locale/zh-TW
- chrome/scrapbook.jar!/locale/zh-TW/scrapbook
- chrome/scrapbook.jar!/skin
- chrome/scrapbook.jar!/skin/classic
- chrome/scrapbook.jar!/skin/classic/scrapbook
- files removed:
- chrome/scrapbook.jar
- files modified:
- chrome.manifest
expand all
collapse all
added
removed
chrome/scrapbook.jar!/skin/classic/scrapbook/capture_entire.png
chrome/scrapbook.jar!/skin/classic/scrapbook/capture_frame.png
chrome/scrapbook.jar!/skin/classic/scrapbook/capture_partial.png
chrome/scrapbook.jar!/skin/classic/scrapbook/capture_target.png
chrome/scrapbook.jar!/skin/classic/scrapbook/dropdown.png
chrome/scrapbook.jar!/skin/classic/scrapbook/edit_annotation.png
chrome/scrapbook.jar!/skin/classic/scrapbook/edit_comment.png
chrome/scrapbook.jar!/skin/classic/scrapbook/edit_cutter.png
chrome/scrapbook.jar!/skin/classic/scrapbook/edit_eraser.png
chrome/scrapbook.jar!/skin/classic/scrapbook/edit_highlighter.png
chrome/scrapbook.jar!/skin/classic/scrapbook/edit_save.png
chrome/scrapbook.jar!/skin/classic/scrapbook/edit_status.png
chrome/scrapbook.jar!/skin/classic/scrapbook/edit_undo.png
chrome/scrapbook.jar!/skin/classic/scrapbook/edit_undo_disable.png
chrome/scrapbook.jar!/skin/classic/scrapbook/exit.png
chrome/scrapbook.jar!/skin/classic/scrapbook/expander.png
chrome/scrapbook.jar!/skin/classic/scrapbook/expander_down.png
chrome/scrapbook.jar!/skin/classic/scrapbook/expander_left.png
chrome/scrapbook.jar!/skin/classic/scrapbook/expander_up.png
chrome/scrapbook.jar!/skin/classic/scrapbook/go_upper.png
chrome/scrapbook.jar!/skin/classic/scrapbook/info.png
chrome/scrapbook.jar!/skin/classic/scrapbook/info_home0.png
chrome/scrapbook.jar!/skin/classic/scrapbook/info_home1.png
chrome/scrapbook.jar!/skin/classic/scrapbook/info_link0.png
chrome/scrapbook.jar!/skin/classic/scrapbook/info_link1.png
chrome/scrapbook.jar!/skin/classic/scrapbook/info_status.png
chrome/scrapbook.jar!/skin/classic/scrapbook/list_picker.png
chrome/scrapbook.jar!/skin/classic/scrapbook/list_selected.png
chrome/scrapbook.jar!/skin/classic/scrapbook/main.png
chrome/scrapbook.jar!/skin/classic/scrapbook/main_16.png
chrome/scrapbook.jar!/skin/classic/scrapbook/main_24.png
chrome/scrapbook.jar!/skin/classic/scrapbook/main_32.png
chrome/scrapbook.jar!/skin/classic/scrapbook/menu_create.png
chrome/scrapbook.jar!/skin/classic/scrapbook/menu_property.png
chrome/scrapbook.jar!/skin/classic/scrapbook/menu_remove.png
chrome/scrapbook.jar!/skin/classic/scrapbook/note_htmlview0.png
chrome/scrapbook.jar!/skin/classic/scrapbook/note_htmlview1.png
chrome/scrapbook.jar!/skin/classic/scrapbook/prefs.png
chrome/scrapbook.jar!/skin/classic/scrapbook/search_all.png
chrome/scrapbook.jar!/skin/classic/scrapbook/search_comment.png
chrome/scrapbook.jar!/skin/classic/scrapbook/search_fulltext.png
chrome/scrapbook.jar!/skin/classic/scrapbook/search_id.png
chrome/scrapbook.jar!/skin/classic/scrapbook/search_source.png
chrome/scrapbook.jar!/skin/classic/scrapbook/search_title.png
chrome/scrapbook.jar!/skin/classic/scrapbook/status_busy.gif
chrome/scrapbook.jar!/skin/classic/scrapbook/sticky_delete.png
chrome/scrapbook.jar!/skin/classic/scrapbook/sticky_header.png
chrome/scrapbook.jar!/skin/classic/scrapbook/sticky_resizer.png
chrome/scrapbook.jar!/skin/classic/scrapbook/sticky_save.png
chrome/scrapbook.jar!/skin/classic/scrapbook/toolbar_create.png
chrome/scrapbook.jar!/skin/classic/scrapbook/toolbar_listview.png
chrome/scrapbook.jar!/skin/classic/scrapbook/toolbar_move.png
chrome/scrapbook.jar!/skin/classic/scrapbook/toolbar_toggle.png
chrome/scrapbook.jar!/skin/classic/scrapbook/treefolder.png
chrome/scrapbook.jar!/skin/classic/scrapbook/treeicon.png
chrome/scrapbook.jar!/skin/classic/scrapbook/treeitem.png
chrome/scrapbook.jar!/skin/classic/scrapbook/treenote.png
