Merge lp:~charlesk/indicator-network/lp-1233679 into lp:indicator-network/13.10

Proposed by Charles Kerr on 2013-10-01
Status: Merged
Approved by: Ted Gould on 2013-10-02
Approved revision: 288
Merged at revision: 289
Proposed branch: lp:~charlesk/indicator-network/lp-1233679
Merge into: lp:indicator-network/13.10
Diff against target: 12 lines (+1/-1)
1 file modified
CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~charlesk/indicator-network/lp-1233679
Reviewer Review Type Date Requested Status
Ted Gould (community) 2013-10-01 Approve on 2013-10-02
PS Jenkins bot (community) continuous-integration Approve on 2013-10-01
Review via email: mp+188706@code.launchpad.net

Description of the change

One-liner to set GETTEXT_PACKAGE explicitly because dh_translations can't handle ${CMAKE_PROJECT_NAME}

To post a comment you must log in.
Ted Gould (ted) wrote :

Begrudgingly approving.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-09-16 04:17:20 +0000
3+++ CMakeLists.txt 2013-10-01 20:03:32 +0000
4@@ -4,7 +4,7 @@
5 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
6
7 set(PACKAGE ${CMAKE_PROJECT_NAME})
8-set(GETTEXT_PACKAGE ${CMAKE_PROJECT_NAME})
9+set(GETTEXT_PACKAGE indicator-network)
10 set(LOCALE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/locale")
11
12 add_definitions( -DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}" )

Subscribers

People subscribed via source and target branches