Merge lp:~ken-vandine/keeper/ual3 into lp:keeper/devel

Proposed by Ken VanDine
Status: Rejected
Rejected by: dobey
Proposed branch: lp:~ken-vandine/keeper/ual3
Merge into: lp:keeper/devel
Diff against target: 38 lines (+3/-3)
3 files modified
debian/control (+1/-1)
src/helper/CMakeLists.txt (+1/-1)
tests/integration/helpers/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/keeper/ual3
Reviewer Review Type Date Requested Status
dobey (community) Disapprove
unity-api-1-bot continuous-integration Needs Fixing
Review via email: mp+317684@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 :
review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:129
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/191/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1718/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1725
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1500
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1500/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1500/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1500
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1500/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1500/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1500
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1500/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1500/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
dobey (dobey) wrote :

Same as the other MP.

review: Disapprove

Unmerged revisions

129. By Ken VanDine

Handle ubuntu-app-launch API change

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-12-14 15:11:28 +0000
3+++ debian/control 2017-02-17 21:31:26 +0000
4@@ -9,7 +9,7 @@
5 # for building the code:
6 libarchive-dev (>= 3.1.2),
7 libproperties-cpp-dev,
8- libubuntu-app-launch2-dev (>= 0.9),
9+ libubuntu-app-launch3-dev,
10 storage-framework-client-dev,
11 libclick-0.4-dev,
12 uuid-dev,
13
14=== modified file 'src/helper/CMakeLists.txt'
15--- src/helper/CMakeLists.txt 2016-12-05 11:36:32 +0000
16+++ src/helper/CMakeLists.txt 2017-02-17 21:31:26 +0000
17@@ -45,7 +45,7 @@
18
19 include(FindPkgConfig)
20 pkg_check_modules(BACKUP_HELPER_DEPENDENCIES REQUIRED
21- ubuntu-app-launch-2
22+ ubuntu-app-launch-3
23 properties-cpp
24 )
25
26
27=== modified file 'tests/integration/helpers/CMakeLists.txt'
28--- tests/integration/helpers/CMakeLists.txt 2016-11-11 14:50:06 +0000
29+++ tests/integration/helpers/CMakeLists.txt 2017-02-17 21:31:26 +0000
30@@ -10,7 +10,7 @@
31 #
32
33 pkg_check_modules(HELPERS_TEST_DEPS REQUIRED
34- ubuntu-app-launch-2
35+ ubuntu-app-launch-3
36 properties-cpp
37 dbustest-1>=14.04.0
38 glib-2.0>=2.26

Subscribers

People subscribed via source and target branches

to all changes: