lp://staging/~seb128/gnome-control-center-unity/gettext-and-intltool

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/gnome-control-center-unity at revision 33

Didier Roche-Tolomelli: Approve on 2013-12-11

Łukasz Zemczak (community): Approve on 2013-12-11

PS Jenkins bot (community): Approve (continuous-integration) on 2013-11-25

Diff: 14 lines (+1/-3)

1 file modified

configure.ac (+1/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

33. By Sebastien Bacher on 2013-11-25

don't use gettext and intltool together, they are conflicting

32. By PS Jenkins bot on 2013-10-04

Releasing 1.3+13.10.20131004-0ubuntu1 (revision 31 from lp:gnome-control-center-unity).

Approved by PS Jenkins bot.

31. By Sebastien Bacher on 2013-10-04

Use GdkColor types, for color swapping, since that's what
libgnome-desktop uses. That's a fix similar to the one done previous to
the color selection code. Fixes: https://bugs.launchpad.net/bugs/1194137.

Approved by Łukasz Zemczak, Michael Terry, PS Jenkins bot.

30. By PS Jenkins bot on 2013-06-14

Releasing 1.3daily13.06.14.1-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

29. By Jeremy Bícha on 2013-06-13

Rename .desktop file for compatibility with gnome-control-center 3.8.

Approved by PS Jenkins bot, Michael Terry.

28. By PS Jenkins bot on 2013-06-13

Releasing 1.3daily13.06.13-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

27. By Sebastien Bacher on 2013-06-12

use the correct colors format for the background settings

libgnome-desktop is using GdkColor values but the code was writing GdkRGBA ones. The first one are deprecated but since that's what the other components want, that's what we should write. Fixes: https://bugs.launchpad.net/bugs/1173818.

Approved by Michael Terry, PS Jenkins bot.

26. By PS Jenkins bot on 2013-06-12

Releasing 1.3daily13.06.12-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

25. By Sebastien Bacher on 2013-06-11

Fix handling of cancellation in async calls (lp: #911475)

That's basically a backport of https://git.gnome.org/browse/gnome-control-center/commit/?id=f9c0732a6c4d1d01e23d35e385e44caee93c5f29.

Approved by PS Jenkins bot, Łukasz Zemczak.

24. By PS Jenkins bot on 2013-05-30

Releasing 1.3daily13.05.30-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.