Merge lp:~pitti/ubiquity/indicator-soname into lp:ubiquity

Proposed by Martin Pitt on 2012-01-30
Status: Merged
Merged at revision: 5146
Proposed branch: lp:~pitti/ubiquity/indicator-soname
Merge into: lp:ubiquity
Diff against target: 30 lines (+9/-3)
2 files modified
debian/changelog (+6/-0)
src/panel/panel.c (+3/-3)
To merge this branch: bzr merge lp:~pitti/ubiquity/indicator-soname
Reviewer Review Type Date Requested Status
Colin Watson 2012-01-30 Approve on 2012-01-30
Review via email: mp+90666@code.launchpad.net

Description of the Change

Bump indicator SONAME, see linked bug report.

To post a comment you must log in.
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-01-27 23:29:12 +0000
3+++ debian/changelog 2012-01-30 10:10:30 +0000
4@@ -1,3 +1,9 @@
5+ubiquity (2.9.14) UNRELEASED; urgency=low
6+
7+ * src/panel/panel.c: Update indicator ABI to 7. (LP: #922052)
8+
9+ -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 30 Jan 2012 10:53:29 +0100
10+
11 ubiquity (2.9.13) precise; urgency=low
12
13 * Make test_osextras reliable across architectures (sort lists).
14
15=== modified file 'src/panel/panel.c'
16--- src/panel/panel.c 2011-09-21 09:00:40 +0000
17+++ src/panel/panel.c 2012-01-30 10:10:30 +0000
18@@ -200,10 +200,10 @@
19 }
20
21 static const char* indicators[] = {
22- "/usr/lib/indicators3/6/libsession.so",
23+ "/usr/lib/indicators3/7/libsession.so",
24 // Bluetooth
25- "/usr/lib/indicators3/6/libapplication.so",
26- "/usr/lib/indicators3/6/libsoundmenu.so",
27+ "/usr/lib/indicators3/7/libapplication.so",
28+ "/usr/lib/indicators3/7/libsoundmenu.so",
29 NULL
30 };
31

Subscribers

People subscribed via source and target branches

to status/vote changes: