Unity Control Center

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

  1. missing-symbols
  2. Merge into trunk
Proposed by Robert Ancell
Status: Merged
Approved by: Sebastien Bacher
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 Approve
PS Jenkins bot (community) continuous-integration Approve
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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:12782
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/100/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-utopic-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-utopic-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-utopic-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/100/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

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

review: Approve
Revision history for this message
Robert Ancell (robert-ancell) wrote :

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

lp:~robert-ancell/unity-control-center/missing-symbols updated
12783. By Robert Ancell

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

Revision history for this message
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
=== modified file 'debian/libunity-control-center1.symbols'
--- debian/libunity-control-center1.symbols 2014-01-08 03:51:28 +0000
+++ debian/libunity-control-center1.symbols 2014-06-26 20:29:46 +0000
@@ -1,17 +1,23 @@
1libunity-control-center.so.1 libunity-control-center1 #MINVER#1libunity-control-center.so.1 libunity-control-center1 #MINVER#
2* Build-Depends-Package: libunity-control-center-dev2* Build-Depends-Package: libunity-control-center-dev
3 cc_editable_entry_get_editable@Base 14.04.03 cc_editable_entry_get_editable@Base 14.04.0
4 cc_editable_entry_get_ellipsize@Base 14.04.3+14.04.20140225
5 cc_editable_entry_get_max_width_chars@Base 14.04.3+14.04.20140225
4 cc_editable_entry_get_scale@Base 14.04.06 cc_editable_entry_get_scale@Base 14.04.0
5 cc_editable_entry_get_selectable@Base 14.04.07 cc_editable_entry_get_selectable@Base 14.04.0
6 cc_editable_entry_get_text@Base 14.04.08 cc_editable_entry_get_text@Base 14.04.0
7 cc_editable_entry_get_type@Base 14.04.09 cc_editable_entry_get_type@Base 14.04.0
8 cc_editable_entry_get_weight@Base 14.04.010 cc_editable_entry_get_weight@Base 14.04.0
11 cc_editable_entry_get_width_chars@Base 14.04.3+14.04.20140225
9 cc_editable_entry_new@Base 14.04.012 cc_editable_entry_new@Base 14.04.0
10 cc_editable_entry_set_editable@Base 14.04.013 cc_editable_entry_set_editable@Base 14.04.0
14 cc_editable_entry_set_ellipsize@Base 14.04.3+14.04.20140225
15 cc_editable_entry_set_max_width_chars@Base 14.04.3+14.04.20140225
11 cc_editable_entry_set_scale@Base 14.04.016 cc_editable_entry_set_scale@Base 14.04.0
12 cc_editable_entry_set_selectable@Base 14.04.017 cc_editable_entry_set_selectable@Base 14.04.0
13 cc_editable_entry_set_text@Base 14.04.018 cc_editable_entry_set_text@Base 14.04.0
14 cc_editable_entry_set_weight@Base 14.04.019 cc_editable_entry_set_weight@Base 14.04.0
20 cc_editable_entry_set_width_chars@Base 14.04.3+14.04.20140225
15 cc_panel_get_display_name@Base 14.04.021 cc_panel_get_display_name@Base 14.04.0
16 cc_panel_get_help_uri@Base 14.04.022 cc_panel_get_help_uri@Base 14.04.0
17 cc_panel_get_permission@Base 14.04.023 cc_panel_get_permission@Base 14.04.0
1824
=== modified file 'debian/rules'
--- debian/rules 2014-04-23 23:14:31 +0000
+++ debian/rules 2014-06-26 20:29:46 +0000
@@ -14,6 +14,7 @@
14 --disable-update-mimedb14 --disable-update-mimedb
1515
16DEB_DH_MAKESHLIBS_ARGS_unity-control-center = --no-act16DEB_DH_MAKESHLIBS_ARGS_unity-control-center = --no-act
17DEB_DH_MAKESHLIBS_ARGS_libunity-control-center1 += -- -c4
1718
18binary-post-install/unity-control-center::19binary-post-install/unity-control-center::
19 dh_migrations -p$(cdbs_curpkg)20 dh_migrations -p$(cdbs_curpkg)

Subscribers

People subscribed via source and target branches