Merge lp://staging/~cyphermox/gtkhtml3.14/for-evo-2.32 into lp://staging/~ubuntu-desktop/gtkhtml3.14/ubuntu

Proposed by Mathieu Trudel-Lapierre
Status: Merged
Merged at revision: 33
Proposed branch: lp://staging/~cyphermox/gtkhtml3.14/for-evo-2.32
Merge into: lp://staging/~ubuntu-desktop/gtkhtml3.14/ubuntu
Diff against target: 130 lines (+26/-29)
8 files modified
debian/changelog (+17/-0)
debian/control (+4/-4)
debian/libgtkhtml-editor-dev.install (+1/-1)
debian/libgtkhtml-editor0.shlibs (+1/-1)
debian/libgtkhtml3.14-19.shlibs (+1/-1)
debian/patches/gtkhtml3.14_ftbfs.patch (+0/-19)
debian/patches/series (+0/-1)
debian/rules (+2/-2)
To merge this branch: bzr merge lp://staging/~cyphermox/gtkhtml3.14/for-evo-2.32
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Review via email: mp+38687@code.staging.launchpad.net
To post a comment you must log in.
29. By Mathieu Trudel-Lapierre

debian/control: Replaces/Conflicts gtkhtml3.14 (<< 3.32.0)

30. By Mathieu Trudel-Lapierre

debian/patches/gtkhtml3.14_ftbfs.patch: dropped.

31. By Mathieu Trudel-Lapierre

debian/control: bump libgtk2.0-dev and libgail-dev Build-Depends to 2.20

32. By Mathieu Trudel-Lapierre

debian/rules: disable deprecation warnings so the build completes

33. By Mathieu Trudel-Lapierre

Add NEWS entries closing bugs with changes in the new release:
  - Crash after closing inline view of text attachment (LP: #178959, #284060)
  - Translations not working in Emoticons, Find/Replace dialogs (LP: #562633)

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Excellent work! Merging :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches