Merge lp:~sergiusens/notify-osd/phablet into lp:notify-osd/phablet

Proposed by Sergio Schvezov
Status: Merged
Approved by: Mirco Müller
Approved revision: 663
Merged at revision: 663
Proposed branch: lp:~sergiusens/notify-osd/phablet
Merge into: lp:notify-osd/phablet
Diff against target: 25 lines (+7/-0)
2 files modified
debian/changelog (+6/-0)
tests/Makefile.am (+1/-0)
To merge this branch: bzr merge lp:~sergiusens/notify-osd/phablet
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Mirco Müller (community) Approve
Review via email: mp+155750@code.launchpad.net

Commit message

Adding the platform api to the linker list for tests

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

The second ci failed because I cancelled it in jenkins as it was doing the same build as the first one

Revision history for this message
Mirco Müller (macslow) wrote :

Approved.

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
=== modified file 'debian/changelog'
--- debian/changelog 2013-02-12 13:59:02 +0000
+++ debian/changelog 2013-03-27 14:50:44 +0000
@@ -1,3 +1,9 @@
1notify-osd (0.10.36) quantal; urgency=low
2
3 * Adding the platform api to the linker list
4
5 -- Sergio Schvezov <sergio.schvezov@canonical.com> Wed, 27 Mar 2013 11:41:21 -0300
6
1notify-osd (0.10.35) quantal; urgency=low7notify-osd (0.10.35) quantal; urgency=low
28
3 * Fixed LP: #10931149 * Fixed LP: #1093114
410
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am 2013-02-14 10:48:55 +0000
+++ tests/Makefile.am 2013-03-27 14:50:44 +0000
@@ -97,6 +97,7 @@
97 $(NOTIFY_OSD_LIBS) \97 $(NOTIFY_OSD_LIBS) \
98 $(GTK_LIBS) \98 $(GTK_LIBS) \
99 -lnotify \99 -lnotify \
100 -lubuntu_application_api \
100 -lgcov101 -lgcov
101102
102VALGRIND_FLAGS = \103VALGRIND_FLAGS = \

Subscribers

People subscribed via source and target branches