Merge lp:~dobey/unity-scope-click/fix-crossbuild into lp:unity-scope-click/devel

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 431
Merged at revision: 431
Proposed branch: lp:~dobey/unity-scope-click/fix-crossbuild
Merge into: lp:unity-scope-click/devel
Diff against target: 22 lines (+2/-2)
2 files modified
debian/control (+1/-1)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~dobey/unity-scope-click/fix-crossbuild
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Diego Sarmentero (community) Approve
Review via email: mp+232611@code.launchpad.net

Commit message

Always install the gsettings schema to the cmake install prefix.
Depend on the native g++ package, so that cross-compiling will work.

Description of the change

To test cross-compiling, you need sbuild, and to follow the procedures described at https://lists.ubuntu.com/archives/ubuntu-devel/2013-December/037904.html to create the sbuild chroot if you haven't already got one, and to do the cross-compiling, after having built a source package with bzr bd -S.

To post a comment you must log in.
Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

+1

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
=== modified file 'debian/control'
--- debian/control 2014-08-21 20:40:44 +0000
+++ debian/control 2014-08-28 18:29:13 +0000
@@ -6,7 +6,7 @@
6Build-Depends: cmake (>= 2.8.10),6Build-Depends: cmake (>= 2.8.10),
7 debhelper (>= 9),7 debhelper (>= 9),
8 dh-translations,8 dh-translations,
9 g++-4.9,9 g++-4.9:native,
10 google-mock,10 google-mock,
11 intltool,11 intltool,
12 libboost-locale-dev,12 libboost-locale-dev,
1313
=== modified file 'debian/rules'
--- debian/rules 2014-06-27 13:19:42 +0000
+++ debian/rules 2014-08-28 18:29:13 +0000
@@ -22,4 +22,4 @@
22 dh $@ --buildsystem cmake --with translations --fail-missing22 dh $@ --buildsystem cmake --with translations --fail-missing
2323
24override_dh_auto_configure:24override_dh_auto_configure:
25 dh_auto_configure -- -DCMAKE_VERBOSE_MAKEFILE=ON25 dh_auto_configure -- -DCMAKE_VERBOSE_MAKEFILE=ON -DGSETTINGS_LOCALINSTALL=ON

Subscribers

People subscribed via source and target branches

to all changes: