content-hub

Merge lp:~ted/content-hub/ual2 into lp:content-hub

  1. ual2
  2. Merge into trunk
Proposed by Łukasz Zemczak
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 71
Merged at revision: 69
Proposed branch: lp:~ted/content-hub/ual2
Merge into: lp:content-hub
Diff against target: 49 lines (+4/-3)
4 files modified
CMakeLists.txt (+1/-1)
debian/control (+1/-1)
src/com/ubuntu/content/CMakeLists.txt (+1/-0)
src/com/ubuntu/content/detail/app_manager.cpp (+1/-1)
To merge this branch: bzr merge lp:~ted/content-hub/ual2
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Didier Roche-Tolomelli Approve
Review via email: mp+198210@code.launchpad.net

Commit message

Upgrading to libupstart-app-launch v2

Description of the change

Upgrading to libupstart-app-launch v2

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

done!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

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 2013-10-01 16:55:39 +0000
3+++ CMakeLists.txt 2013-12-09 09:28:19 +0000
4@@ -59,7 +59,7 @@
5 find_package(PkgConfig REQUIRED)
6 pkg_check_modules(GLIB REQUIRED glib-2.0)
7 pkg_check_modules(GIO REQUIRED gio-unix-2.0)
8-pkg_check_modules(UPSTART_LAUNCH REQUIRED upstart-app-launch-1)
9+pkg_check_modules(UPSTART_LAUNCH REQUIRED upstart-app-launch-2)
10 pkg_check_modules(GSETTINGS REQUIRED gsettings-qt)
11 pkg_check_modules(NIH REQUIRED libnih)
12 pkg_check_modules(NIH_DBUS REQUIRED libnih-dbus)
13
14=== modified file 'debian/control'
15--- debian/control 2013-10-09 22:39:03 +0000
16+++ debian/control 2013-12-09 09:28:19 +0000
17@@ -11,7 +11,7 @@
18 libglib2.0-dev,
19 libgsettings-qt-dev,
20 libnih-dbus-dev,
21- libupstart-app-launch1-dev,
22+ libupstart-app-launch2-dev,
23 qt5-default,
24 qtbase5-dev,
25 qtdeclarative5-dev,
26
27=== modified file 'src/com/ubuntu/content/CMakeLists.txt'
28--- src/com/ubuntu/content/CMakeLists.txt 2013-10-01 16:55:39 +0000
29+++ src/com/ubuntu/content/CMakeLists.txt 2013-12-09 09:28:19 +0000
30@@ -24,6 +24,7 @@
31 ${GIO_INCLUDE_DIRS}
32 ${NIH_INCLUDE_DIRS}
33 ${NIH_DBUS_INCLUDE_DIRS}
34+ ${UPSTART_LAUNCH_INCLUDE_DIRS}
35 )
36
37 qt5_add_dbus_interface(
38
39=== modified file 'src/com/ubuntu/content/detail/app_manager.cpp'
40--- src/com/ubuntu/content/detail/app_manager.cpp 2013-09-06 10:17:01 +0000
41+++ src/com/ubuntu/content/detail/app_manager.cpp 2013-12-09 09:28:19 +0000
42@@ -16,7 +16,7 @@
43
44 #include "app_manager.h"
45
46-#include <libupstart-app-launch-1/upstart-app-launch.h>
47+#include <upstart-app-launch.h>
48
49 namespace cucd = com::ubuntu::content::detail;
50

Subscribers

People subscribed via source and target branches