Merge lp:~fboucault/location-service/crossbuild_fixes into lp:location-service/trunk

Proposed by Florian Boucault on 2016-07-06
Status: Needs review
Proposed branch: lp:~fboucault/location-service/crossbuild_fixes
Merge into: lp:location-service/trunk
Diff against target: 39 lines (+4/-3)
3 files modified
debian/control (+1/-1)
debian/control.in (+1/-1)
debian/rules (+2/-1)
To merge this branch: bzr merge lp:~fboucault/location-service/crossbuild_fixes
Reviewer Review Type Date Requested Status
Michał Sawicz 2016-07-06 Needs Fixing on 2016-07-06
PS Jenkins bot continuous-integration Pending
Review via email: mp+299275@code.launchpad.net

Commit message

Fixes for crossbuilding and multiarch.

Description of the change

Fixes for crossbuilding and multiarch.

To post a comment you must log in.
Michał Sawicz (saviq) wrote :

This failed for me with:

ln: failed to create symbolic link '/home/michal/location-service/debian/libubuntu-location-service2.install.amd64': File exists

Had to remove these links to get it to work.

review: Needs Fixing

Unmerged revisions

262. By Florian Boucault on 2016-07-06

Fix Multi-Arch

261. By Florian Boucault on 2016-07-05

Fixes for crossbuilding.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2016-03-11 10:00:24 +0000
3+++ debian/control 2016-07-06 08:33:34 +0000
4@@ -56,7 +56,7 @@
5 Package: libubuntu-location-service-dev
6 Section: libdevel
7 Architecture: any
8-Multi-Arch: foreign
9+Multi-Arch: same
10 Recommends: ubuntu-location-service-doc,
11 Depends: libubuntu-location-service2 (= ${binary:Version}),
12 libdbus-1-dev,
13
14=== modified file 'debian/control.in'
15--- debian/control.in 2016-03-11 11:01:55 +0000
16+++ debian/control.in 2016-07-06 08:33:34 +0000
17@@ -51,7 +51,7 @@
18 Package: libubuntu-location-service-dev
19 Section: libdevel
20 Architecture: any
21-Multi-Arch: foreign
22+Multi-Arch: same
23 Recommends: ubuntu-location-service-doc,
24 Depends: libubuntu-location-service@UBUNTU_LOCATION_SERVICE_SOVERSION@ (= ${binary:Version}),
25 libdbus-1-dev,
26
27=== modified file 'debian/rules'
28--- debian/rules 2016-03-11 10:00:24 +0000
29+++ debian/rules 2016-07-06 08:33:34 +0000
30@@ -43,7 +43,8 @@
31 dh_strip --dbg-package=libubuntu-location-service-dbg
32
33 override_dh_auto_configure:
34- dh_auto_configure -- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/ubuntu-location-service -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX) -DLOCATION_SERVICE_ENABLE_GPS_PROVIDER=$(LOCATION_SERVICE_ENABLE_GPS_PROVIDER) -DUBUNTU_LOCATION_SERVICE_VERSION_MAJOR=$(major) -DUBUNTU_LOCATION_SERVICE_VERSION_MINOR=$(minor) -DUBUNTU_LOCATION_SERVICE_VERSION_PATCH=$(patch)
35+ dh_auto_configure -- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/ubuntu-location-service -DLOCATION_SERVICE_ENABLE_GPS_PROVIDER=$(LOCATION_SERVICE_ENABLE_GPS_PROVIDER) -DUBUNTU_LOCATION_SERVICE_VERSION_MAJOR=$(major) -DUBUNTU_LOCATION_SERVICE_VERSION_MINOR=$(minor) -DUBUNTU_LOCATION_SERVICE_VERSION_PATCH=$(patch)
36+ /bin/sh $(CURDIR)/debian/gen-debian-files.sh $(CURDIR)/debian
37
38 override_dh_auto_clean:
39 rm -f $(CURDIR)/debian/libubuntu-location-service$(major).install.amd64

Subscribers

People subscribed via source and target branches