Pay Service

Merge lp:~ken-vandine/pay-service/ual_api_change into lp:pay-service

  1. ual_api_change
  2. Merge into trunk.15.10
Proposed by Ken VanDine
Status: Merged
Approved by: dobey
Approved revision: 143
Merged at revision: 141
Proposed branch: lp:~ken-vandine/pay-service/ual_api_change
Merge into: lp:pay-service
Diff against target: 64 lines (+5/-5)
5 files modified
CMakeLists.txt (+1/-1)
debian/control (+1/-1)
pay-ui/backend/CMakeLists.txt (+1/-1)
service-ng/src/launchpad.net/go-ual/ual/helper_observers.go (+1/-1)
service-ng/src/launchpad.net/go-ual/ual/ubuntu_app_launch.go (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/pay-service/ual_api_change
Reviewer Review Type Date Requested Status
dobey (community) Approve
unity-api-1-bot continuous-integration Needs Fixing
Review via email: mp+316760@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.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:141
https://jenkins.canonical.com/unity-api-1/job/lp-pay-service-ci/16/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1659/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1666
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1441/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1441/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1441/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1441/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1441/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1441/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-pay-service-ci/16/rebuild

review: Needs Fixing (continuous-integration)
lp:~ken-vandine/pay-service/ual_api_change updated
142. By Ken VanDine

pkgconfig fixes for UAL

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:142
https://jenkins.canonical.com/unity-api-1/job/lp-pay-service-ci/17/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1660/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1667
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1442/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1442/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1442/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1442/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1442/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1442/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-pay-service-ci/17/rebuild

review: Needs Fixing (continuous-integration)
lp:~ken-vandine/pay-service/ual_api_change updated
143. By Ken VanDine

dropped debian/changelog entry

Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-05-20 14:27:28 +0000
3+++ CMakeLists.txt 2017-02-10 19:24:50 +0000
4@@ -41,7 +41,7 @@
5 gio-unix-2.0
6 properties-cpp
7 trust-store
8- ubuntu-app-launch-2>=0.9
9+ ubuntu-app-launch-3
10 )
11 include_directories (SYSTEM ${SERVICE_DEPS_INCLUDE_DIRS})
12
13
14=== modified file 'debian/control'
15--- debian/control 2016-08-22 13:48:58 +0000
16+++ debian/control 2017-02-10 19:24:50 +0000
17@@ -25,7 +25,7 @@
18 libprocess-cpp-dev (>= 2.0.0),
19 libproperties-cpp-dev,
20 libtrust-store-dev,
21- libubuntu-app-launch2-dev (>= 0.9),
22+ libubuntu-app-launch3-dev,
23 libubuntuoneauth-2.0-dev,
24 pep8,
25 pkg-config,
26
27=== modified file 'pay-ui/backend/CMakeLists.txt'
28--- pay-ui/backend/CMakeLists.txt 2016-05-16 20:20:37 +0000
29+++ pay-ui/backend/CMakeLists.txt 2017-02-10 19:24:50 +0000
30@@ -8,7 +8,7 @@
31 ${CMAKE_CURRENT_SOURCE_DIR}
32 )
33
34-pkg_check_modules(UBUNTUONEAUTH REQUIRED ubuntuoneauth-2.0 ubuntu-app-launch-2>=0.9)
35+pkg_check_modules(UBUNTUONEAUTH REQUIRED ubuntuoneauth-2.0 ubuntu-app-launch-3)
36 add_definitions(${UBUNTUONEAUTH_CFLAGS} ${UBUNTUONEAUTH_CFLAGS_OTHER})
37
38 set(
39
40=== modified file 'service-ng/src/launchpad.net/go-ual/ual/helper_observers.go'
41--- service-ng/src/launchpad.net/go-ual/ual/helper_observers.go 2015-09-21 22:39:24 +0000
42+++ service-ng/src/launchpad.net/go-ual/ual/helper_observers.go 2017-02-10 19:24:50 +0000
43@@ -17,7 +17,7 @@
44
45 package ual
46
47-// #cgo pkg-config: ubuntu-app-launch-2
48+// #cgo pkg-config: ubuntu-app-launch-3
49 // #include <stdlib.h>
50 // #include <ubuntu-app-launch.h>
51 //
52
53=== modified file 'service-ng/src/launchpad.net/go-ual/ual/ubuntu_app_launch.go'
54--- service-ng/src/launchpad.net/go-ual/ual/ubuntu_app_launch.go 2015-10-01 22:20:55 +0000
55+++ service-ng/src/launchpad.net/go-ual/ual/ubuntu_app_launch.go 2017-02-10 19:24:50 +0000
56@@ -17,7 +17,7 @@
57
58 package ual
59
60-// #cgo pkg-config: ubuntu-app-launch-2
61+// #cgo pkg-config: ubuntu-app-launch-3
62 // #include <stdlib.h>
63 // #include <ubuntu-app-launch.h>
64 //

Subscribers

People subscribed via source and target branches

to all changes: