Merge lp:~sil2100/location-service/gps-arm64 into lp:location-service/trunk

Proposed by Łukasz Zemczak
Status: Needs review
Proposed branch: lp:~sil2100/location-service/gps-arm64
Merge into: lp:location-service/trunk
Diff against target: 54 lines (+6/-5)
4 files modified
debian/bileto_pre_release_hook (+1/-0)
debian/control (+2/-2)
debian/control.in (+2/-2)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~sil2100/location-service/gps-arm64
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+306483@code.launchpad.net

Commit message

Enable gps provider on arm64.

Description of the change

To post a comment you must log in.
Revision history for this message
Scott Sweeny (ssweeny) wrote :

FYI I've already put these changes into a silo:
https://bileto.ubuntu.com/#/ticket/1922

Unmerged revisions

275. By Łukasz Zemczak

Enable gps provider on arm64.

274. By Launchpad Translations on behalf of phablet-team

Launchpad automatic translations update.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/bileto_pre_release_hook' (properties changed: +x to -x)
--- debian/bileto_pre_release_hook 2016-04-12 06:33:54 +0000
+++ debian/bileto_pre_release_hook 2016-09-22 15:00:08 +0000
@@ -69,6 +69,7 @@
69process "$dir/libubuntu-location-service-dev.install.in" >"$dir/libubuntu-location-service-dev.install"69process "$dir/libubuntu-location-service-dev.install.in" >"$dir/libubuntu-location-service-dev.install"
7070
71ln -vsf "libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.with-gps" "$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.amd64"71ln -vsf "libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.with-gps" "$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.amd64"
72ln -vsf "libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.with-gps" "$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.arm64"
72ln -vsf "libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.with-gps" "$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.armhf"73ln -vsf "libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.with-gps" "$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.armhf"
73ln -vsf "libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.with-gps" "$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.i386"74ln -vsf "libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.with-gps" "$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.i386"
7475
7576
=== modified file 'debian/control'
--- debian/control 2016-04-05 17:16:02 +0000
+++ debian/control 2016-09-22 15:00:08 +0000
@@ -29,8 +29,8 @@
29 libnet-cpp-dev,29 libnet-cpp-dev,
30 libprocess-cpp-dev,30 libprocess-cpp-dev,
31 libtrust-store-dev,31 libtrust-store-dev,
32 libubuntu-platform-hardware-api-headers [!arm64 !ppc64el !powerpc],32 libubuntu-platform-hardware-api-headers [!ppc64el !powerpc],
33 libubuntu-platform-hardware-api-dev [!arm64 !ppc64el !powerpc],33 libubuntu-platform-hardware-api-dev [!ppc64el !powerpc],
34 libproperties-cpp-dev,34 libproperties-cpp-dev,
35 lsb-release,35 lsb-release,
36 trust-store-bin,36 trust-store-bin,
3737
=== modified file 'debian/control.in'
--- debian/control.in 2016-03-11 11:01:55 +0000
+++ debian/control.in 2016-09-22 15:00:08 +0000
@@ -24,8 +24,8 @@
24 libnet-cpp-dev,24 libnet-cpp-dev,
25 libprocess-cpp-dev,25 libprocess-cpp-dev,
26 libtrust-store-dev,26 libtrust-store-dev,
27 libubuntu-platform-hardware-api-headers [!arm64 !ppc64el !powerpc],27 libubuntu-platform-hardware-api-headers [!ppc64el !powerpc],
28 libubuntu-platform-hardware-api-dev [!arm64 !ppc64el !powerpc],28 libubuntu-platform-hardware-api-dev [!ppc64el !powerpc],
29 libproperties-cpp-dev,29 libproperties-cpp-dev,
30 lsb-release,30 lsb-release,
31 trust-store-bin,31 trust-store-bin,
3232
=== modified file 'debian/rules'
--- debian/rules 2016-04-05 17:26:56 +0000
+++ debian/rules 2016-09-22 15:00:08 +0000
@@ -27,7 +27,7 @@
27minor=$(shell echo $(full_version) | cut -d'.' -f2)27minor=$(shell echo $(full_version) | cut -d'.' -f2)
28patch=$(shell echo $(full_version) | cut -d'.' -f3)28patch=$(shell echo $(full_version) | cut -d'.' -f3)
2929
30ifneq (,$(filter $(DEB_HOST_ARCH),ppc64el powerpc arm64))30ifneq (,$(filter $(DEB_HOST_ARCH),ppc64el powerpc))
31 LOCATION_SERVICE_ENABLE_GPS_PROVIDER = OFF31 LOCATION_SERVICE_ENABLE_GPS_PROVIDER = OFF
32else32else
33 LOCATION_SERVICE_ENABLE_GPS_PROVIDER = ON33 LOCATION_SERVICE_ENABLE_GPS_PROVIDER = ON

Subscribers

People subscribed via source and target branches