Merge lp:~ken-vandine/ubuntu-push/ual_api_change into lp:ubuntu-push

Proposed by Ken VanDine on 2017-02-08
Status: Merged
Approved by: Jonas G. Drange on 2017-02-10
Approved revision: 177
Merged at revision: 176
Proposed branch: lp:~ken-vandine/ubuntu-push/ual_api_change
Merge into: lp:ubuntu-push
Diff against target: 38 lines (+3/-3)
3 files modified
debian/control (+1/-1)
debian/rules (+1/-1)
launch_helper/cual/cual.go (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu-push/ual_api_change
Reviewer Review Type Date Requested Status
Jonas G. Drange (community) Approve on 2017-02-10
dobey (community) 2017-02-08 Approve on 2017-02-10
Review via email: mp+316757@code.launchpad.net

Commit message

Handle ubuntu-app-launch API change

Description of the change

Handle ubuntu-app-launch API change

To post a comment you must log in.
176. By Ken VanDine on 2017-02-08

More pkgconfig fixes for UAL

177. By Ken VanDine on 2017-02-10

dropped debian/changelog entry

dobey (dobey) :
review: Approve
Jonas G. Drange (jonas-drange) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2016-09-29 13:57:04 +0000
+++ debian/control 2017-02-10 19:25:55 +0000
@@ -15,7 +15,7 @@
15 libgcrypt11-dev,15 libgcrypt11-dev,
16 libglib2.0-dev (>= 2.31.6),16 libglib2.0-dev (>= 2.31.6),
17 libmessaging-menu-dev,17 libmessaging-menu-dev,
18 libubuntu-app-launch2-dev,18 libubuntu-app-launch3-dev,
19 libubuntuoneauth-2.0-dev,19 libubuntuoneauth-2.0-dev,
20 libdbus-1-dev,20 libdbus-1-dev,
21 libnih-dbus-dev,21 libnih-dbus-dev,
2222
=== modified file 'debian/rules'
--- debian/rules 2016-07-08 20:20:36 +0000
+++ debian/rules 2017-02-10 19:25:55 +0000
@@ -9,7 +9,7 @@
9testskip_architectures := powerpc s390x9testskip_architectures := powerpc s390x
1010
11ifneq (,$(filter $(DEB_HOST_ARCH), arm64 powerpc ppc64el s390x))11ifneq (,$(filter $(DEB_HOST_ARCH), arm64 powerpc ppc64el s390x))
12 pkg_configs = ubuntuoneauth-2.0 libaccounts-glib click-0.4 ubuntu-app-launch-2 url-dispatcher-1 messaging-menu dbus-1 libnih libnih-dbus glib-2.0 gobject-2.012 pkg_configs = ubuntuoneauth-2.0 libaccounts-glib click-0.4 ubuntu-app-launch url-dispatcher-1 messaging-menu dbus-1 libnih libnih-dbus glib-2.0 gobject-2.0
13 export CGO_CFLAGS := \13 export CGO_CFLAGS := \
14 $(shell $(foreach pkg, $(pkg_configs), pkg-config --cflags $(pkg); ))14 $(shell $(foreach pkg, $(pkg_configs), pkg-config --cflags $(pkg); ))
15 export CGO_CXXFLAGS := $(CGO_CFLAGS)15 export CGO_CXXFLAGS := $(CGO_CFLAGS)
1616
=== modified file 'launch_helper/cual/cual.go'
--- launch_helper/cual/cual.go 2014-07-29 15:36:00 +0000
+++ launch_helper/cual/cual.go 2017-02-10 19:25:55 +0000
@@ -17,7 +17,7 @@
17package cual17package cual
1818
19/*19/*
20#cgo pkg-config: ubuntu-app-launch-220#cgo pkg-config: ubuntu-app-launch-3
21#include <glib.h>21#include <glib.h>
2222
23gboolean add_observer (gpointer);23gboolean add_observer (gpointer);

Subscribers

People subscribed via source and target branches