lp:~noskcaj/ubuntu/wily/epiphany-browser/merge
- Get this branch:
- bzr branch lp:~noskcaj/ubuntu/wily/epiphany-browser/merge
Branch merges
- Martin Pitt: Approve
-
Diff: 11870 lines (+370/-5393)24 files modified.pc/00_epiphany-browser.patch/configure.ac (+0/-261)
.pc/07_bookmarks.patch/data/default-bookmarks.rdf.in (+0/-37)
.pc/12_safetypes.patch/data/mime-types-permissions.xml (+0/-482)
.pc/81_ubuntu_force_update_bookmarks_menu.patch/src/bookmarks/ephy-bookmarks-ui.c (+0/-363)
.pc/applied-patches (+0/-5)
.pc/ubuntu_titlebars.patch/src/ephy-window.c (+0/-4026)
ChangeLog (+86/-0)
NEWS (+8/-0)
configure (+11/-11)
configure.ac (+1/-1)
debian/changelog (+23/-0)
debian/control (+1/-1)
debian/control.in (+1/-1)
debian/patches/00_epiphany-browser.patch (+6/-8)
embed/web-extension/ephy-web-extension.c (+16/-6)
help/de/de.po (+5/-5)
help/de/pref-do-not-track.page (+1/-2)
lib/ephy-web-dom-utils.c (+11/-15)
lib/ephy-web-dom-utils.h (+5/-4)
po/ca.po (+4/-4)
po/eo.po (+1/-1)
po/th.po (+188/-158)
src/ephy-shell-search-provider-generated.c (+1/-1)
src/ephy-shell-search-provider-generated.h (+1/-1)
Branch information
- Owner:
- Jackson Doak
- Status:
- Development
Recent revisions
- 128. By Jackson Doak
-
* Merge from Debian unstable. Remaining changes:
- debian/patches/ 07_bookmarks. patch:
Add Ubuntu-specific default bookmarks, borrowed from Firefox
- debian/patches/ 81_ubuntu_ force_update_ bookmarks_ menu.patch:
update the bookmarks menu every time the internal structure
is changed (needed for the indicator application menu to work
correctly).
- debian/patches/ ubuntu_ titlebars. patch: Use traditional titlebars
for non-GNOME sessions
* New upstream release.
* Refresh patches.
* Recommend libwebkit2gtk-4.0-37- dbg instead of libwebkitgtk- 3.0-0-dbg
following the switch to WebKit2. - 126. By Jackson Doak
-
* Merge from Debian unstable. Remaining changes:
- debian/patches/ 07_bookmarks. patch:
Add Ubuntu-specific default bookmarks, borrowed from Firefox
- debian/patches/ 81_ubuntu_ force_update_ bookmarks_ menu.patch:
update the bookmarks menu every time the internal structure
is changed (needed for the indicator application menu to work
correctly).
- debian/patches/ ubuntu_ titlebars. patch: Use traditional titlebars
for non-GNOME sessions - 125. By Jackson Doak
-
* New upstream release.
* Merge from debian. Remaining changes:
- debian/patches/ 07_bookmarks. patch:
Add Ubuntu-specific default bookmarks, borrowed from Firefox
- debian/patches/ 81_ubuntu_ force_update_ bookmarks_ menu.patch:
update the bookmarks menu every time the internal structure
is changed (needed for the indicator application menu to work
correctly).
- debian/patches/ ubuntu_ titlebars. patch: Use traditional titlebars
for non-GNOME sessions - 123. By Tim Lunn
-
debian/
patches/ ubuntu_ titlebars. patch: Use traditional titlebars
for non-GNOME sessions (LP: #1263387) - 122. By Tim Lunn
-
* New upstream release (LP: #1260942)
* Sync with Debian. Remaining changes:
- debian/patches/ 07_bookmarks. patch:
Add Ubuntu-specific default bookmarks, borrowed from Firefox
- debian/patches/ 81_ubuntu_ force_update_ bookmarks_ menu.patch:
update the bookmarks menu every time the internal structure
is changed (needed for the indicator application menu to work
correctly).
- Don't depend on gnome-desktop3 3.10
* debian/patches/ 00_epiphany- browser. patch: Refreshed - 121. By Sebastien Bacher
-
* Resynchronize on Debian, remaining changes
* debian/patches/ 07_bookmarks. patch:
- Ubuntu-specific default bookmarks, borrowed from Firefox
* debian/patches/ 81_ubuntu_ force_update_ bookmarks_ menu.patch:
- update the bookmarks on changes, needed for appmenu to work correctly - 120. By Gustavo Noronha Silva
-
[ Jeremy Bicha ]
* New upstream unstable release
* debian/control.in:
- Bump minimum intltool to 0.50
* debian/epiphany- browser- data.install:
- The developers no longer provide help files to install since they were
too outdated
* Dropped upstream patches:
- 01_email-as-user- for-password- remembering. patch
- 13_toolbar_size_fixes. patch
* debian/watch: Watch for unstable releases.[ Emilio Pozuelo Monfort ]
* New upstream release.
+ debian/patches/ 14_pkglibdir. patch:
- Removed, applied upstream.
+ debian/control.in:
- Update (build-)dependencies. [ Gustavo Noronha Silva ]
* debian/control.in:
- Build-Depend on gnome-common >= 3.6, needed for the code
coverage feature
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/wily/epiphany-browser