Merge lp://staging/~noskcaj/ubuntu/utopic/cheese/3.12.2 into lp://staging/ubuntu/utopic/cheese

Proposed by Jackson Doak
Status: Needs review
Proposed branch: lp://staging/~noskcaj/ubuntu/utopic/cheese/3.12.2
Merge into: lp://staging/ubuntu/utopic/cheese
Diff against target: 10803 lines (+2137/-4944)
70 files modified
.pc/0001-Use-avatar-chooser-headerbar-only-when-requested.patch/libcheese/cheese-avatar-chooser.c (+0/-180)
.pc/0002-Use-a-traditional-title-bar-when-requested.patch/Makefile.am (+0/-561)
.pc/0002-Use-a-traditional-title-bar-when-requested.patch/data/cheese-main-window.ui (+0/-236)
.pc/0002-Use-a-traditional-title-bar-when-requested.patch/data/cheese.gresource.xml (+0/-15)
.pc/0002-Use-a-traditional-title-bar-when-requested.patch/src/cheese-window.vala (+0/-1348)
.pc/applied-patches (+0/-3)
.pc/use-plugins-good/configure.ac (+0/-226)
ChangeLog (+91/-1)
INSTALL (+2/-2)
Makefile.in (+13/-4)
NEWS (+21/-0)
aclocal.m4 (+169/-68)
build-aux/config.guess (+97/-64)
build-aux/config.sub (+24/-21)
build-aux/missing (+2/-2)
build-aux/test-driver (+16/-4)
cheese-config.h.in (+0/-3)
configure (+162/-180)
configure.ac (+3/-3)
data/cheese.desktop.in (+1/-1)
data/headerbar.ui (+0/-10)
debian/changelog (+8/-0)
debian/patches/0001-Use-avatar-chooser-headerbar-only-when-requested.patch (+0/-52)
debian/patches/0002-Use-a-traditional-title-bar-when-requested.patch (+0/-155)
debian/patches/series (+0/-2)
docs/reference/Makefile.in (+2/-1)
docs/reference/html/index.html (+1/-1)
help/Makefile.in (+2/-1)
help/el/burst-mode.page (+20/-27)
help/el/effects-apply.page (+8/-12)
help/el/el.po (+543/-507)
help/el/index.page (+4/-4)
help/el/introduction.page (+9/-9)
help/el/legal.xml (+1/-1)
help/el/photo-delete.page (+14/-17)
help/el/photo-save.page (+9/-15)
help/el/photo-take.page (+16/-23)
help/el/photo-view.page (+6/-11)
help/el/pref-countdown.page (+5/-5)
help/el/pref-flash.page (+6/-9)
help/el/pref-fullscreen.page (+6/-8)
help/el/pref-image-properties.page (+11/-12)
help/el/pref-resolution.page (+7/-7)
help/el/video-record.page (+16/-23)
help/pt_BR/burst-mode.page (+11/-7)
help/pt_BR/effects-apply.page (+11/-9)
help/pt_BR/index.page (+6/-0)
help/pt_BR/introduction.page (+6/-0)
help/pt_BR/photo-delete.page (+8/-4)
help/pt_BR/photo-save.page (+12/-12)
help/pt_BR/photo-take.page (+12/-13)
help/pt_BR/photo-view.page (+8/-7)
help/pt_BR/pref-countdown.page (+9/-3)
help/pt_BR/pref-flash.page (+9/-6)
help/pt_BR/pref-fullscreen.page (+9/-4)
help/pt_BR/pref-image-properties.page (+8/-3)
help/pt_BR/pref-resolution.page (+6/-0)
help/pt_BR/pt_BR.po (+69/-177)
help/pt_BR/video-record.page (+11/-11)
po/POTFILES.in (+1/-0)
po/ca@valencia.po (+172/-133)
po/el.po (+78/-75)
po/id.po (+58/-60)
po/nl.po (+243/-531)
src/cheese-application.c (+1/-1)
src/cheese-countdown.c (+1/-1)
src/cheese-effects-manager.c (+1/-1)
src/cheese-main.c (+1/-1)
src/cheese-preferences.c (+1/-1)
src/cheese-window.c (+90/-50)
To merge this branch: bzr merge lp://staging/~noskcaj/ubuntu/utopic/cheese/3.12.2
Reviewer Review Type Date Requested Status
Daniel Holbach Approve
Review via email: mp+222884@code.staging.launchpad.net

Description of the change

New upstream bugfix release. Drops our patches and updates translations

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Conflict adding file data/headerbar.ui. Moved existing file to data/headerbar.ui.moved.

review: Needs Fixing
Revision history for this message
Jackson Doak (noskcaj) wrote :

Could this be uploaded manually please? I can't get the bzr branch to behave

Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks. Uploaded.

review: Approve

Unmerged revisions

107. By Jackson Doak

* New upstream release.
* Drop 0001-Use-avatar-chooser-headerbar-only-when-requested.patch,
  0002-Use-a-traditional-title-bar-when-requested.patch. Fixed upstream

106. By Jackson Doak

decommit patches

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

to all changes: