lp:~noskcaj/ubuntu/vivid/epiphany-browser/3.14

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/vivid/epiphany-browser

Tim Lunn (community): Approve on 2014-12-21

Ubuntu branches: Pending requested 2014-12-20

Diff: 253977 lines api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

127. By Jackson Doak on 2014-12-20

New upstream release.

126. By Jackson Doak on 2014-12-20

* 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
* New upstream release
  - debian/patches/00_epiphany-browser.patch: Refreshed
  - debian/control.in: Bump libsoup-gnome2.4-dev build-dep to 2.48.0
* debian/control.in: Bump Standards-Version to 3.9.6 (no further changes)
* debian/rule: Pass --list-missing to dh_install
* debian/epiphany-browser.install, debian/epiphany-browser-data.install:
  Install new search provider, appdata file and documentation
* Move the .desktop file and the dbus service file to the main package, it
  doesn't really make sense to install them without the executable
* Rename the executable and the desktop file to the upstream name
  (epiphany-browser → epiphany)
* Update Homepage URL.
* Set <email address hidden> as Maintainer.
* debian/control.in: Update Vcs-* URLs.
* Target unstable
* New upstream release
* Bump webkit b-d
* New upstream release
* debian/patches/ephy-title-box-Fix-crash-when-closing-second-windo.patch
  + Dropped fixed upstream
* debian/control.in: Update build-dependencies
* debian/patches/ephy-title-box-Fix-crash-when-closing-second-windo.patch
  + Added. Fix crash when closing a second epiphany window (from bgo 732784)
* New upstream release.
* Unfuzz debian/patches/00_epiphany-browser.patch
* Upload to unstable.
* New upstream version.
* debian/control.in:
  - Bump libgtk-3-dev build dependency to (>= 3.11.6).
  - Bump libwebkit2gtk-3.0-dev build dependency to (>= 2.3.90).
  - Drop libwebkitgtk-3.0-dev build dependency.
  - Drop duplicated libavahi-gobject-dev build-dependecy.
  - Bump Standards-Version to 3.9.2. No further changes.
* debian/patches
  - Refresh debian/patches/00_epiphany-browser.patch.
  - Refresh debian/patches/10_smart_bookmarks.patch.
  - Refresh debian/patches/07_bookmarks.patch.
  - Drop 01_with_webkit2.patch applied upstream.
* New upstream release (3.12.0)
* debian/epiphany-browser.install: Update web extensions directory
* debian/patches/00_epiphany-browser.patch: Refreshed
* debian/control: Bump libglib2.0-dev & libwebkit2gtk-3.0-dev build-deps
* debian/rules:
  + Rename epiphany.desktop to epiphany-browser.desktop again,
    accidentally removed in 3.8.2-2 while removing epiphany-newtab.desktop.
* debian/patches/00_epiphany-browser.patch:
  + Don't change the prgname when running in webapp mode.

125. By Jackson Doak on 2014-12-20

Merging shared upstream rev into target branch.

124. By Tim Lunn on 2014-09-23

No change rebuild for gnome-desktop 3.12

123. By Tim Lunn on 2013-12-22

debian/patches/ubuntu_titlebars.patch: Use traditional titlebars
for non-GNOME sessions (LP: #1263387)

122. By Tim Lunn on 2013-12-14

* 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 on 2013-11-13

* 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 on 2012-12-10

[ 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

119. By Sebastian Dröge on 2012-03-29

Rename gir1.2-epiphany-3.3.install to gir1.2-epiphany-3.4.install
to actually get the files into the renamed package.

118. By Michael Biebl on 2012-03-12

[ Michael Biebl ]
* Change section of gir1.2-epiphany-3.2 to introspection.

[ Jeremy Bicha ]
* New upstream release
* debian/rules, debian/branding.conf.in:
  - Use lsb-release to fill in user agent string
* debian/control.in:
  - Bump minimum GTK, glib, libsoup, and webkit
  - Build-depend on lsb-release and libsqlite3-dev
  - Standards-Version 3.9.3
* debian/epiphany-browser-data.gconf-defaults:
  - Dropped, obsolete. (Epiphany doesn't support a homepage setting
    any more.)
* debian/epiphany-browser-data.install:
  - Icons were dropped upstream
* debian/patches/00_epiphany-browser.patch: Refreshed
* debian/patches/01_bookmarks_menu.patch: Dropped, obsolete
* debian/patches/10_smart_bookmarks: Dropped, obsolete

[ Michael Biebl ]
* Rename gir1.2-epiphany-3.2 → gir1.2-epiphany-3.3 and drop obsolete
  Conflicts/Replaces while at it.
* debian/patches/05_libexecdir.patch: Dropped, we no longer build different
  backends so this patch is obsolete.
* Make epiphany-browser-dev arch-any since we need tight dependencies on
  epiphany-browser and gir1.2-epiphany-3.3.