Merge lp://qastaging/~indicator-applet-developers/indicator-network/secret-agent into lp://qastaging/indicator-network/13.10

Proposed by Pete Woods
Status: Merged
Approved by: Charles Kerr
Approved revision: no longer in the source branch.
Merged at revision: 276
Proposed branch: lp://qastaging/~indicator-applet-developers/indicator-network/secret-agent
Merge into: lp://qastaging/indicator-network/13.10
Diff against target: 1669 lines (+1333/-127)
25 files modified
CMakeLists.txt (+35/-6)
cmake/FindGMock.cmake (+10/-0)
cmake/FindValgrind.cmake (+34/-0)
config.h.in (+2/-1)
data/CMakeLists.txt (+17/-2)
data/indicator-secret-agent.conf.in (+8/-0)
data/nm-agent-manager.xml (+38/-0)
data/nm-secret-agent.xml (+190/-0)
debian/control (+16/-12)
network/CMakeLists.txt (+0/-1)
secret-agent/CMakeLists.txt (+59/-0)
secret-agent/DBusTypes.h (+37/-0)
secret-agent/Localisation.h (+28/-0)
secret-agent/SecretAgent.cpp (+136/-0)
secret-agent/SecretAgent.h (+81/-0)
secret-agent/SecretAgentInclude.h (+25/-0)
secret-agent/SecretRequest.cpp (+65/-0)
secret-agent/SecretRequest.h (+71/-0)
secret-agent/main.cpp (+54/-0)
test/network.py (+0/-105)
tests/CMakeLists.txt (+61/-0)
tests/TestIndicatorNetworkService.cpp (+60/-0)
tests/TestSecretAgent.cpp (+167/-0)
tests/data/valgrind.suppression (+95/-0)
tests/main.cpp (+44/-0)
To merge this branch: bzr merge lp://qastaging/~indicator-applet-developers/indicator-network/secret-agent
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+182421@code.qastaging.launchpad.net

Commit message

Move the secret agent code over into this package

Description of the change

Move the secret agent code over into this package

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: Approve (continuous-integration)
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)
275. By PS Jenkins bot

Releasing 0.5.0+13.10.20130827.3-0ubuntu1 (revision 273 from lp:indicator-network).

Approved by PS Jenkins bot.

Revision history for this message
Charles Kerr (charlesk) wrote :

> W: Failed to fetch bzip2:/var/lib/apt/lists/partial/ppa.launchpad.net_ubuntu-unity_daily-build_ubuntu_dists_saucy_main_binary-armhf_Packages Hash Sum mismatch

That's not right. Kicking off a rebuild.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) :
review: Approve
276. By Pete Woods

Move the secret agent code over into this package.

Approved by Charles Kerr, PS Jenkins bot.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: