Merge lp://qastaging/~dobey/indicator-datetime/fix-gsettings into lp://qastaging/indicator-datetime

Proposed by dobey
Status: Needs review
Proposed branch: lp://qastaging/~dobey/indicator-datetime/fix-gsettings
Merge into: lp://qastaging/indicator-datetime
Prerequisite: lp://qastaging/~dobey/indicator-datetime/fix-i18n
Diff against target: 552 lines (+388/-55)
7 files modified
cmake/UseGSettings.cmake (+0/-23)
data/CMakeLists.txt (+19/-10)
data/com.canonical.indicator.datetime.gschema.xml.in.in (+1/-1)
debian/control (+1/-1)
po/CMakeLists.txt (+3/-1)
po/indicator-datetime.pot (+360/-1)
tests/CMakeLists.txt (+4/-18)
To merge this branch: bzr merge lp://qastaging/~dobey/indicator-datetime/fix-gsettings
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Needs Fixing
Charles Kerr (community) Approve
Review via email: mp+317144@code.qastaging.launchpad.net

Commit message

Use the cmake-extras gsettings module.
Ensure the schema file's strings get pulled for translation.
Ensure the translations from utils.c get pulled as well.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

jenkins failures appear to be a false alarm due to missing cmake-extras 1.2

Revision history for this message
Charles Kerr (charlesk) wrote :

Comments inline

review: Approve
481. By dobey

Updates for newer version of cmake-extras.

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)
482. By dobey

Merge up trunk.

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)

Unmerged revisions

482. By dobey

Merge up trunk.

481. By dobey

Updates for newer version of cmake-extras.

480. By dobey

Use the cmake-extras gsettings module.
Ensure the schema file's strings get pulled for translation.
Ensure the translations from utils.c get pulled as well.

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