unity-scope-click

Merge lp:~dobey/unity-scope-click/cross-build into lp:unity-scope-click/devel

  1. cross-build
  2. Merge into devel
Proposed by dobey
Status: Merged
Approved by: Ted Gould
Approved revision: 322
Merged at revision: 323
Proposed branch: lp:~dobey/unity-scope-click/cross-build
Merge into: lp:unity-scope-click/devel
Diff against target: 31 lines (+2/-3)
2 files modified
CMakeLists.txt (+1/-2)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~dobey/unity-scope-click/cross-build
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Ted Gould (community) Approve
Review via email: mp+226474@code.launchpad.net

Commit message

Drop the include of FindPkgConfig in CMakeLists.txt.
Change the python3 build-depends to be :native, for cross-compiling.

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

Works for me

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

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 2014-07-04 13:10:05 +0000
3+++ CMakeLists.txt 2014-07-11 14:47:52 +0000
4@@ -19,13 +19,12 @@
5 set(APPS_LIB_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/unity-scopes/clickapps/)
6 set(APPS_DATA_DIR ${CMAKE_INSTALL_FULL_DATADIR}/unity/scopes/clickapps/)
7
8-include(FindPkgConfig)
9 include(UseGSettings)
10+find_package (PkgConfig REQUIRED)
11
12 pkg_check_modules(UNITY_SCOPES REQUIRED libunity-scopes>=0.5.0 libunity-api>=0.1.3)
13 add_definitions(${UNITY_SCOPES_CFLAGS} ${UNITY_SCOPES_CFLAGS_OTHER})
14
15-find_package (PkgConfig REQUIRED)
16 pkg_check_modules(UBUNTUONE REQUIRED ubuntuoneauth-2.0)
17 add_definitions(${UBUNTUONE_CFLAGS} ${UBUNTUONE_CFLAGS_OTHER})
18
19
20=== modified file 'debian/control'
21--- debian/control 2014-07-08 20:32:51 +0000
22+++ debian/control 2014-07-11 14:47:52 +0000
23@@ -16,7 +16,7 @@
24 libunity-scopes-dev (>= 0.5.0),
25 libgsettings-qt-dev,
26 pkg-config,
27- python3-all,
28+ python3-all:native,
29 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
30 Standards-Version: 3.9.5
31 Homepage: https://launchpad.net/unity-scope-click

Subscribers

People subscribed via source and target branches

to all changes: