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

[Ken VanDine]

Handle ubuntu-app-launch API change

Handle ubuntu-app-launch API change

[lp:~ken-vandine/ubuntu-push/ual_api_change]

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)]

LGTM

review: Approve

=== 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 @@
                libgcrypt11-dev,
                libglib2.0-dev (>= 2.31.6),
                libmessaging-menu-dev,
-               libubuntu-app-launch2-dev,
+               libubuntu-app-launch3-dev,
                libubuntuoneauth-2.0-dev,
                libdbus-1-dev,
                libnih-dbus-dev,

=== 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 @@
 testskip_architectures := powerpc s390x
 
 ifneq (,$(filter $(DEB_HOST_ARCH), arm64 powerpc ppc64el s390x))
-  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.0
+  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
   export CGO_CFLAGS := \
     $(shell $(foreach pkg, $(pkg_configs), pkg-config --cflags $(pkg); ))
   export CGO_CXXFLAGS := $(CGO_CFLAGS)

=== 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 @@
 package cual
 
 /*
-#cgo pkg-config: ubuntu-app-launch-2
+#cgo pkg-config: ubuntu-app-launch-3
 #include <glib.h>
 
 gboolean add_observer (gpointer);