location-service

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

  1. gps-arm64
  2. Merge into trunk
Proposed by You-Sheng Yang
Status: Rejected
Rejected by: Łukasz Zemczak
Proposed branch: lp:~vicamo/location-service/gps-arm64
Merge into: lp:location-service/trunk
Diff against target: 62 lines (+7/-5)
4 files modified
debian/control (+2/-2)
debian/control.in (+2/-2)
debian/gen-debian-files.sh (+1/-0)
debian/rules (+2/-1)
To merge this branch: bzr merge lp:~vicamo/location-service/gps-arm64
Reviewer Review Type Date Requested Status
Łukasz Zemczak Disapprove
Thomas Voß (community) Approve
Review via email: mp+304362@code.launchpad.net

Commit message

Enable gps provider on arm64.

Description of the change

Enable gps provider on arm64.

To post a comment you must log in.
Revision history for this message
Thomas Voß (thomas-voss) wrote :

LGTM.

review: Approve
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

+1

review: Approve
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

This branch no longer merges cleanly. Superseeded by this:
https://code.launchpad.net/~sil2100/location-service/gps-arm64/+merge/306483

review: Disapprove

Unmerged revisions

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-08-30 11:25:33 +0000
4@@ -29,8 +29,8 @@
5 libnet-cpp-dev,
6 libprocess-cpp-dev,
7 libtrust-store-dev,
8- libubuntu-platform-hardware-api-headers [!arm64 !ppc64el !powerpc],
9- libubuntu-platform-hardware-api-dev [!arm64 !ppc64el !powerpc],
10+ libubuntu-platform-hardware-api-headers [!ppc64el !powerpc],
11+ libubuntu-platform-hardware-api-dev [!ppc64el !powerpc],
12 libproperties-cpp-dev,
13 lsb-release,
14 trust-store-bin,
15
16=== modified file 'debian/control.in'
17--- debian/control.in 2016-03-11 11:01:55 +0000
18+++ debian/control.in 2016-08-30 11:25:33 +0000
19@@ -24,8 +24,8 @@
20 libnet-cpp-dev,
21 libprocess-cpp-dev,
22 libtrust-store-dev,
23- libubuntu-platform-hardware-api-headers [!arm64 !ppc64el !powerpc],
24- libubuntu-platform-hardware-api-dev [!arm64 !ppc64el !powerpc],
25+ libubuntu-platform-hardware-api-headers [!ppc64el !powerpc],
26+ libubuntu-platform-hardware-api-dev [!ppc64el !powerpc],
27 libproperties-cpp-dev,
28 lsb-release,
29 trust-store-bin,
30
31=== modified file 'debian/gen-debian-files.sh'
32--- debian/gen-debian-files.sh 2016-03-11 11:01:55 +0000
33+++ debian/gen-debian-files.sh 2016-08-30 11:25:33 +0000
34@@ -105,6 +105,7 @@
35 cat $warning $infile | sed -e "s/@UBUNTU_LOCATION_SERVICE_SOVERSION@/${soversion}/" > "$outfile"
36
37 ln -s "${dir}"/libubuntu-location-service${soversion}.install.with-gps "${dir}"/libubuntu-location-service${soversion}.install.amd64
38+ln -s "${dir}"/libubuntu-location-service${soversion}.install.with-gps "${dir}"/libubuntu-location-service${soversion}.install.arm64
39 ln -s "${dir}"/libubuntu-location-service${soversion}.install.with-gps "${dir}"/libubuntu-location-service${soversion}.install.armhf
40 ln -s "${dir}"/libubuntu-location-service${soversion}.install.with-gps "${dir}"/libubuntu-location-service${soversion}.install.i386
41
42
43=== modified file 'debian/rules'
44--- debian/rules 2016-03-11 10:00:24 +0000
45+++ debian/rules 2016-08-30 11:25:33 +0000
46@@ -27,7 +27,7 @@
47 minor=$(shell echo $(full_version) | cut -d'.' -f2)
48 patch=$(shell echo $(full_version) | cut -d'.' -f3)
49
50-ifneq (,$(filter $(DEB_HOST_ARCH),ppc64el powerpc arm64))
51+ifneq (,$(filter $(DEB_HOST_ARCH),ppc64el powerpc))
52 LOCATION_SERVICE_ENABLE_GPS_PROVIDER = OFF
53 else
54 LOCATION_SERVICE_ENABLE_GPS_PROVIDER = ON
55@@ -47,6 +47,7 @@
56
57 override_dh_auto_clean:
58 rm -f $(CURDIR)/debian/libubuntu-location-service$(major).install.amd64
59+ rm -f $(CURDIR)/debian/libubuntu-location-service$(major).install.arm64
60 rm -f $(CURDIR)/debian/libubuntu-location-service$(major).install.armhf
61 rm -f $(CURDIR)/debian/libubuntu-location-service$(major).install.i386
62 /bin/sh $(CURDIR)/debian/gen-debian-files.sh $(CURDIR)/debian

Subscribers

People subscribed via source and target branches