Merge lp:~ricmm/qtubuntu-media/platform-api-v2 into lp:qtubuntu-media

Proposed by Ricardo Mendoza
Status: Needs review
Proposed branch: lp:~ricmm/qtubuntu-media/platform-api-v2
Merge into: lp:qtubuntu-media
Diff against target: 24 lines (+1/-2)
2 files modified
debian/control (+0/-1)
src/aal/aal.pro (+1/-1)
To merge this branch: bzr merge lp:~ricmm/qtubuntu-media/platform-api-v2
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+222054@code.launchpad.net

Commit message

Remove unfounded build-dep on platform API

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Unmerged revisions

34. By Ricardo Mendoza

Remove wrong dependency on ubuntu-platform-api

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 2014-04-28 22:41:25 +0000
3+++ debian/control 2014-06-04 14:47:42 +0000
4@@ -10,7 +10,6 @@
5 libpulse-dev,
6 libqt5opengl5-dev,
7 libqtubuntu-media-signals-dev (>= 0.3+14.04.20140307-0ubuntu2),
8- libubuntu-platform-api1-dev,
9 pkg-config,
10 qt5-default,
11 qtbase5-dev,
12
13=== modified file 'src/aal/aal.pro'
14--- src/aal/aal.pro 2014-03-26 16:08:35 +0000
15+++ src/aal/aal.pro 2014-06-04 14:47:42 +0000
16@@ -11,7 +11,7 @@
17
18 INCLUDEPATH += /usr/include/hybris /usr/include/libqtubuntu-media-signals
19 LIBS += \
20- -lhybris-common -lubuntu_application_api -lmedia -lqtubuntu-media-signals \
21+ -lhybris-common -lmedia -lqtubuntu-media-signals \
22 -lmedia-hub-client
23
24 OTHER_FILES += aalmediaplayer.json

Subscribers

People subscribed via source and target branches