Merge lp:~ken-vandine/libertine-scope/ual_bump into lp:libertine-scope/release

Proposed by Ken VanDine
Status: Merged
Approved by: Larry Price
Approved revision: 68
Merged at revision: 64
Proposed branch: lp:~ken-vandine/libertine-scope/ual_bump
Merge into: lp:libertine-scope/release
Prerequisite: lp:~larryprice/libertine-scope/updated-cmake-extras
Diff against target: 25 lines (+2/-2)
2 files modified
CMakeLists.txt (+1/-1)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/libertine-scope/ual_bump
Reviewer Review Type Date Requested Status
Larry Price Approve
Review via email: mp+318525@code.launchpad.net

Commit message

Handle ubuntu-app-launch API bump

Description of the change

Handle ubuntu-app-launch API bump

To post a comment you must log in.
Revision history for this message
Larry Price (larryprice) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2016-08-01 13:24:26 +0000
+++ CMakeLists.txt 2017-02-28 19:08:07 +0000
@@ -44,7 +44,7 @@
44add_definitions(-DGETTEXT_PACKAGE="${SCOPE_NAME}")44add_definitions(-DGETTEXT_PACKAGE="${SCOPE_NAME}")
4545
46pkg_check_modules(SCOPE libunity-scopes>=1.0.0 REQUIRED)46pkg_check_modules(SCOPE libunity-scopes>=1.0.0 REQUIRED)
47pkg_check_modules(UAL ubuntu-app-launch-2>=0.9.0 REQUIRED)47pkg_check_modules(UAL ubuntu-app-launch-3>=0.9.0 REQUIRED)
48pkg_check_modules(LIBERTINE libertine>=0.99 REQUIRED)48pkg_check_modules(LIBERTINE libertine>=0.99 REQUIRED)
4949
50# Add our dependencies to the include paths50# Add our dependencies to the include paths
5151
=== modified file 'debian/control'
--- debian/control 2016-07-13 17:26:54 +0000
+++ debian/control 2017-02-28 19:08:07 +0000
@@ -11,7 +11,7 @@
11 intltool,11 intltool,
12 libunity-scopes-dev (>= 1.0.0),12 libunity-scopes-dev (>= 1.0.0),
13 liburl-dispatcher1-dev,13 liburl-dispatcher1-dev,
14 libubuntu-app-launch2-dev,14 libubuntu-app-launch3-dev,
15 liblibertine-dev,15 liblibertine-dev,
16 pkg-config,16 pkg-config,
17 qtbase5-dev17 qtbase5-dev

Subscribers

People subscribed via source and target branches