lp:~noskcaj/ubuntu/utopic/cheese/3.12.2

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:ubuntu/utopic/cheese

Daniel Holbach (community): Approve on 2014-06-30

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

107. By Jackson Doak on 2014-06-11

* 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 on 2014-06-11

decommit patches

105. By Iain Lane on 2014-05-23

* Sync with Debian. Remaining changes:
  - Add apport hook
  - debian/control.in:
    + Build-depend on good gstreamer plugins instead of bad
    + configure.ac only asks for gnome-desktop >= 2.91.6
  - debian/patches/use-plugins-good:
    + The camerabin plugin is part of the good gstreamer plugins in Ubuntu
    + Refreshed
  - 0001-Use-avatar-chooser-headerbar-only-when-requested.patch,
    0002-Use-a-traditional-title-bar-when-requested.patch: Use traditional
    title bars when necessary.

104. By Iain Lane on 2014-05-02

* Sync with Debian. Remaining changes:
  - Add apport hook
  - debian/control.in:
    + Build-depend on good gstreamer plugins instead of bad
  - debian/patches/use-plugins-good:
    + The camerabin plugin is part of the good gstreamer plugins in Ubuntu
    + Refreshed
* debian/patches/hide-header-bar: Hide header bar (use a traditional title
  bar) when necessary.
* vala 0.24 is actually required for VariantDict.

103. By Dimitri John Ledkov on 2014-04-27

No change rebuild against libcogl20.

102. By Iain Lane on 2014-01-14

No-change rebuild for new cogl

101. By Robert Ancell on 2013-12-17

* New upstream release:
  - Fix leak in CheeseCameraDeviceMonitor test
  - Fixed unused-but-set warning in EogThumbNav
  - Fix memory leak in cheese_camera_device_get_caps()
  - Fix cheese_thumb_view_append_item() memory leaks
  - Fix several memory leaks found with valgrind.
  - Fix memory leak when creating a new CheeseCamera
  - Fix some memory leaks in cheese_fileutil_init()
  - Make static string array const
  - Simplify looping over GStrv

100. By Artur Rona on 2013-12-15

* Merge from Debian unstable. (LP: #1261080) Remaining changes:
  - debian/cheese-common.install, debian/source_cheese.py:
    + Add Apport hook.
  - debian/control:
    + Bump conflicts/replaces since we didn't take the
      libcheese-gtk-dev/ libcheese-doc split until raring.
    + Build-Depends on good gstreamer plugins instead of bad.
    + Suggest gnome-video-effects-extra, as well.
  - debian/patches/use-plugins-good.patch:
    + The camerabin plugin is part of the good gstreamer plugins
      in Ubuntu.
* debian/patches/fix-help-license.patch,
  debian/patches/fix-um-crop-license.patch:
  - Removed, fixed upstream.

99. By Jeremy Bícha on 2013-08-01

* New upstream release
* debian/patches/fix-help-license.patch:
  - Clarify that the help files are under the CC-BY-SA 3.0 license
* debian/patches/fix-um-crop-license.patch:
  - Backport git commit relicensing this file as GPL-2+ instead of GPL-3+
* debian/copyright:
  - Updated and converted to the 1.0 copyright format

98. By Jeremy Bícha on 2013-06-09

* Don't have libcheese7 depend on gstreamer1.0-plugins-bad
* Suggest gnome-video-effects-extra or gnome-video-effects-frei0r