Merge lp:~robert-ancell/unity-control-center/missing-symbols into lp:unity-control-center

Proposed by Robert Ancell on 2014-06-26
Status: Merged
Approved by: Sebastien Bacher on 2014-06-26
Approved revision: 12782
Merged at revision: 12783
Proposed branch: lp:~robert-ancell/unity-control-center/missing-symbols
Merge into: lp:unity-control-center
Diff against target: 39 lines (+7/-0)
2 files modified
debian/libunity-control-center1.symbols (+6/-0)
debian/rules (+1/-0)
To merge this branch: bzr merge lp:~robert-ancell/unity-control-center/missing-symbols
Reviewer Review Type Date Requested Status
Sebastien Bacher 2014-06-26 Approve on 2014-06-27
PS Jenkins bot (community) continuous-integration Approve on 2014-06-26
Review via email: mp+224546@code.launchpad.net

Commit message

Add symbols that were added in revision 12731

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

Thanks, should we also change the rules to use -c4/stop on missing symbols?

review: Approve
Robert Ancell (robert-ancell) wrote :

Yes we should, I just never worked out how to do that.

12783. By Robert Ancell on 2014-06-26

Add the magic to make the build stop when symbols are added

Sebastien Bacher (seb128) wrote :

> Yes we should, I just never worked out how to do that.

seems like you just did, thanks ;-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/libunity-control-center1.symbols'
2--- debian/libunity-control-center1.symbols 2014-01-08 03:51:28 +0000
3+++ debian/libunity-control-center1.symbols 2014-06-26 20:29:46 +0000
4@@ -1,17 +1,23 @@
5 libunity-control-center.so.1 libunity-control-center1 #MINVER#
6 * Build-Depends-Package: libunity-control-center-dev
7 cc_editable_entry_get_editable@Base 14.04.0
8+ cc_editable_entry_get_ellipsize@Base 14.04.3+14.04.20140225
9+ cc_editable_entry_get_max_width_chars@Base 14.04.3+14.04.20140225
10 cc_editable_entry_get_scale@Base 14.04.0
11 cc_editable_entry_get_selectable@Base 14.04.0
12 cc_editable_entry_get_text@Base 14.04.0
13 cc_editable_entry_get_type@Base 14.04.0
14 cc_editable_entry_get_weight@Base 14.04.0
15+ cc_editable_entry_get_width_chars@Base 14.04.3+14.04.20140225
16 cc_editable_entry_new@Base 14.04.0
17 cc_editable_entry_set_editable@Base 14.04.0
18+ cc_editable_entry_set_ellipsize@Base 14.04.3+14.04.20140225
19+ cc_editable_entry_set_max_width_chars@Base 14.04.3+14.04.20140225
20 cc_editable_entry_set_scale@Base 14.04.0
21 cc_editable_entry_set_selectable@Base 14.04.0
22 cc_editable_entry_set_text@Base 14.04.0
23 cc_editable_entry_set_weight@Base 14.04.0
24+ cc_editable_entry_set_width_chars@Base 14.04.3+14.04.20140225
25 cc_panel_get_display_name@Base 14.04.0
26 cc_panel_get_help_uri@Base 14.04.0
27 cc_panel_get_permission@Base 14.04.0
28
29=== modified file 'debian/rules'
30--- debian/rules 2014-04-23 23:14:31 +0000
31+++ debian/rules 2014-06-26 20:29:46 +0000
32@@ -14,6 +14,7 @@
33 --disable-update-mimedb
34
35 DEB_DH_MAKESHLIBS_ARGS_unity-control-center = --no-act
36+DEB_DH_MAKESHLIBS_ARGS_libunity-control-center1 += -- -c4
37
38 binary-post-install/unity-control-center::
39 dh_migrations -p$(cdbs_curpkg)

Subscribers

People subscribed via source and target branches