-
Committer:
Bazaar Package Importer
-
Author(s):
Artur Rona
-
Date:
2010-10-14 12:45:29 UTC
-
mfrom:
(98.1.7 sid)
-
Revision ID:
james.westby@ubuntu.com-20101014124529-57hi6lecoo68e3sq
Tags: 2.30.6-1ubuntu1
* Merge from debian unstable. Remaining changes:
- Update the search URL:
+ add debian/patches/80_ubuntu_search_url.patch
+ update debian/epiphany-browser-data.gconf-defaults
- Set branding to Ubuntu.
- debian/patches/81_ubuntu_force_update_bookmarks_menu.patch:
+ Update the bookmarks menu every time the internal structure
is changed (needed for the UNE application menu to work correctly).
- Support appindicator.
- debian/control.in:
+ Temporary bump for gir dependencies to ensure we rebuild against
the correct version.
- debian/patches/13_clearing_temp.patch:
+ Fix crashing epiphany-browser while clearing temp files.
This patch can be dropped with new upstream 2.32 release.
* debian/control.in:
- Bump Build-Depends on network-manager-dev to avoid FTBFS.