trust-store

Merge lp:~thomas-voss/trust-store/fix-1452341 into lp:trust-store

  1. fix-1452341
  2. Merge into trunk
Proposed by Thomas Voß
Status: Superseded
Proposed branch: lp:~thomas-voss/trust-store/fix-1452341
Merge into: lp:trust-store
Diff against target: 305 lines (+17/-183)
7 files modified
CMakeLists.txt (+2/-3)
debian/changelog (+6/-0)
debian/control (+5/-11)
debian/libtrust-store1.symbols (+0/-162)
debian/rules (+1/-6)
src/core/trust/mir/agent.cpp (+1/-1)
src/core/trust/mir/prompt_main.cpp (+2/-0)
To merge this branch: bzr merge lp:~thomas-voss/trust-store/fix-1452341
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Marcus Tomlinson (community) Approve
PS Jenkins bot continuous-integration Approve
Pete Woods (community) Approve
Review via email: mp+265629@code.launchpad.net

This proposal has been superseded by a proposal from 2015-08-31.

Commit message

Bump major revision to account for toolchain update.

Description of the change

Bump major revision to account for toolchain update.

To post a comment you must log in.
Revision history for this message
Pete Woods (pete-woods) wrote :

Looks reasonable to me. Good luck getting the symbols removal though, though.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:107
http://jenkins.qa.ubuntu.com/job/trust-store-ci/90/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-i386-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/trust-store-ci/90/rebuild

review: Approve (continuous-integration)
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

Very OCD I know:

86 Description: Test files for libtrust-store1

"libtrust-store2" now

Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

Top approving again to mark rev.108 as approved.

review: Approve
Revision history for this message
Michael Vogt (mvo) wrote :

Looks good to me.

review: Approve

Unmerged revisions

108. By Thomas Voß

Fix package name in description.

107. By Thomas Voß

Fix minor compilation issues.
Account for major version bump and rename .install file.

106. By Thomas Voß

Bump major revision to account for toolchain update. Fixes LP:#1452341

105. By Launchpad Translations on behalf of phablet-team

Launchpad automatic translations update.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-09-19 19:51:37 +0000
3+++ CMakeLists.txt 2015-07-23 08:28:52 +0000
4@@ -43,12 +43,11 @@
5 )
6 endif()
7
8-pkg_check_modules(GFLAGS libgflags REQUIRED)
9 pkg_check_modules(GLOG libglog REQUIRED)
10 pkg_check_modules(PROCESS_CPP process-cpp REQUIRED)
11
12-set(TRUST_STORE_VERSION_MAJOR 1)
13-set(TRUST_STORE_VERSION_MINOR 1)
14+set(TRUST_STORE_VERSION_MAJOR 2)
15+set(TRUST_STORE_VERSION_MINOR 0)
16 set(TRUST_STORE_VERSION_PATCH 0)
17
18 include(CTest)
19
20=== modified file 'debian/changelog'
21--- debian/changelog 2015-02-13 13:54:28 +0000
22+++ debian/changelog 2015-07-23 08:28:52 +0000
23@@ -1,3 +1,9 @@
24+trust-store (2.0.0) wily; urgency=medium
25+
26+ * Bump major revision to account for toolchain update. Fixes LP:#1452341
27+
28+ -- Thomas Voß <thomas.voss@canonical.com> Thu, 23 Jul 2015 09:22:15 +0200
29+
30 trust-store (1.1.0+15.04.20150213-0ubuntu1) vivid; urgency=medium
31
32 [ thomas-voss ]
33
34=== modified file 'debian/control'
35--- debian/control 2014-10-09 18:12:53 +0000
36+++ debian/control 2015-07-23 08:28:52 +0000
37@@ -6,10 +6,6 @@
38 doxygen,
39 google-mock,
40 graphviz,
41-# We rely on C++11 features, and to prevent from ABI breaks
42-# in libstdc++ causing us issues, we explicitly select a G++
43-# version.
44- g++-4.9,
45 libapparmor-dev,
46 libboost-program-options-dev,
47 libboost-system-dev,
48@@ -34,7 +30,7 @@
49 # upstream branch
50 Vcs-Bzr: lp:trust-store
51
52-Package: libtrust-store1
53+Package: libtrust-store2
54 Architecture: any
55 Multi-Arch: same
56 Pre-Depends: ${misc:Pre-Depends},
57@@ -52,7 +48,7 @@
58 Multi-Arch: same
59 Pre-Depends: ${misc:Pre-Depends},
60 Recommends: libtrust-store-doc,
61-Depends: libtrust-store1 (= ${binary:Version}),
62+Depends: libtrust-store2 (= ${binary:Version}),
63 ${misc:Depends},
64 Description: C++11 library for persisting trust requests - dev files
65 Provides a common implementation of a trust store to be used by trusted
66@@ -64,10 +60,8 @@
67 Package: trust-store-bin
68 Section: devel
69 Architecture: any
70-Depends: libtrust-store1 (= ${binary:Version}),
71+Depends: libtrust-store2 (= ${binary:Version}),
72 ${misc:Depends},
73-Replaces: libtrust-store1 (<< 1.1.0+14.10.20141008),
74-Breaks: libtrust-store1 (<< 1.1.0+14.10.20141008),
75 Description: Daemon binaries to be used by services.
76 Provides a common implementation of a trust store to be used by trusted
77 helpers.
78@@ -77,10 +71,10 @@
79 Package: trust-store-tests
80 Section: libdevel
81 Architecture: any
82-Depends: libtrust-store1 (= ${binary:Version}),
83+Depends: libtrust-store2 (= ${binary:Version}),
84 ${misc:Depends},
85 Suggests: libtrust-store-dev,
86-Description: Test files for libtrust-store1
87+Description: Test files for libtrust-store2
88 Provides a common implementation of a trust store to be used by trusted
89 helpers.
90 .
91
92=== removed file 'debian/libtrust-store1.symbols'
93--- debian/libtrust-store1.symbols 2014-10-15 18:23:38 +0000
94+++ debian/libtrust-store1.symbols 1970-01-01 00:00:00 +0000
95@@ -1,162 +0,0 @@
96-libtrust-store.so.1 libtrust-store1 #MINVER#
97- (c++)"core::trust::WhiteListingAgent::always_grant_for_unconfined()@Base" 1.1.0+14.10.20141015
98- (c++)"core::trust::WhiteListingAgent::authenticate_request_with_parameters(core::trust::Agent::RequestParameters const&)@Base" 1.1.0+14.10.20141015
99- (c++)"core::trust::WhiteListingAgent::WhiteListingAgent(std::function<bool (core::trust::Agent::RequestParameters const&)>, std::shared_ptr<core::trust::Agent> const&)@Base" 1.1.0+14.10.20141015
100- (c++)"core::trust::WhiteListingAgent::~WhiteListingAgent()@Base" 1.1.0+14.10.20141015
101- (c++)"typeinfo for core::trust::WhiteListingAgent@Base" 1.1.0+14.10.20141015
102- (c++)"typeinfo name for core::trust::WhiteListingAgent@Base" 1.1.0+14.10.20141015
103- (c++)"vtable for core::trust::WhiteListingAgent@Base" 1.1.0+14.10.20141015
104- (c++)"core::trust::i18n::default_text_domain()@Base" 1.1.0+14.10.20141008.1
105- (c++)"core::trust::i18n::service_text_domain()@Base" 1.1.0+14.10.20141008.1
106- (c++)"core::trust::i18n::set_service_text_domain(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1.0+14.10.20141008.1
107- (c++)"core::trust::i18n::tr(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1.0+14.10.20141008.1
108- (c++)"core::trust::i18n::tr(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1.0+14.10.20141008.1
109- (c++)"core::trust::CachedAgent::Configuration::~Configuration()@Base" 1.0.0+14.10.20140806.7
110- (c++)"core::trust::CachedAgent::authenticate_request_with_parameters(core::trust::Agent::RequestParameters const&)@Base" 1.0.0+14.10.20140806.7
111- (c++)"core::trust::CachedAgent::Reporter::report_cached_answer_found(core::trust::Agent::RequestParameters const&, core::trust::Request const&)@Base" 1.0.0+14.10.20140814.1
112- (c++)"core::trust::CachedAgent::Reporter::report_user_prompted_for_trust(core::trust::Agent::RequestParameters const&, core::trust::Request::Answer const&)@Base" 1.0.0+14.10.20140814.1
113- (c++)"core::trust::CachedAgent::CachedAgent(core::trust::CachedAgent::Configuration const&)@Base" 1.0.0+14.10.20140806.7
114- (c++)"core::trust::create_default_store(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.0.1+14.10.20140626.1
115- (c++)"core::trust::process_trust_request(core::trust::RequestParameters const&)@Base" 0.0.1+14.10.20140717.8
116- (c++)"core::trust::CachedAgentGlogReporter::report_cached_answer_found(core::trust::Agent::RequestParameters const&, core::trust::Request const&)@Base" 1.0.0+14.10.20140814.1
117- (c++)"core::trust::CachedAgentGlogReporter::report_user_prompted_for_trust(core::trust::Agent::RequestParameters const&, core::trust::Request::Answer const&)@Base" 1.0.0+14.10.20140814.1
118- (c++)"core::trust::CachedAgentGlogReporter::CachedAgentGlogReporter(core::trust::CachedAgentGlogReporter::Configuration const&)@Base" 1.0.0+14.10.20140814.1
119- (c++)"core::trust::CachedAgentGlogReporter::~CachedAgentGlogReporter()@Base" 1.0.0+14.10.20140814.1
120- (c++)"core::trust::AppIdFormattingTrustAgent::authenticate_request_with_parameters(core::trust::Agent::RequestParameters const&)@Base" 1.0.0+14.10.20140826.1
121- (c++)"core::trust::AppIdFormattingTrustAgent::AppIdFormattingTrustAgent(std::shared_ptr<core::trust::Agent> const&)@Base" 1.0.0+14.10.20140826.1
122- (c++)"core::trust::AppIdFormattingTrustAgent::~AppIdFormattingTrustAgent()@Base" 1.0.0+14.10.20140826.1
123- (c++)"core::trust::expose_store_to_bus_with_name(std::shared_ptr<core::trust::Store> const&, std::shared_ptr<core::dbus::Bus> const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.0.1+14.10.20140626.1
124- (c++)"core::trust::resolve_store_on_bus_with_name(std::shared_ptr<core::dbus::Bus> const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.0.1+14.10.20140626.1
125- (c++)"core::trust::expose_store_to_session_with_name(std::shared_ptr<core::trust::Store> const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.0.1+14.10.20140626.1
126- (c++)"core::trust::resolve_store_in_session_with_name(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.0.1+14.10.20140626.1
127- (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::PromptProviderHelper::InvocationArguments::~InvocationArguments()@Base" 0.0.1+14.10.20140717.8
128- (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::PromptProviderHelper::exec_prompt_provider_with_arguments(core::trust::mir::PromptProviderHelper::InvocationArguments const&)@Base" 0.0.1+14.10.20140717.8
129- (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::PromptProviderHelper::PromptProviderHelper(core::trust::mir::PromptProviderHelper::CreationArguments const&)@Base" 0.0.1+14.10.20140717.8
130- (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::ConnectionVirtualTable::create_prompt_session_sync(core::trust::TaggedInteger<core::trust::tag::Pid, int>, void (*)(MirPromptSession*, MirPromptSessionState, void*), void*)@Base" 1.0.0+14.10.20140806.7
131- (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::ConnectionVirtualTable::ConnectionVirtualTable()@Base" 1.0.0+14.10.20141001
132- (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::ConnectionVirtualTable::ConnectionVirtualTable(MirConnection*)@Base" 0.0.1+14.10.20140717.8
133- (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::PromptSessionVirtualTable::release_sync()@Base" 0.0.1+14.10.20140717.8
134- (c++|arch=amd64 arm64)"core::trust::mir::PromptSessionVirtualTable::mir_client_fd_callback(MirPromptSession*, unsigned long, int const*, void*)@Base" 1.0.0+14.10.20140806.7
135- (c++|arch=i386 armhf)"core::trust::mir::PromptSessionVirtualTable::mir_client_fd_callback(MirPromptSession*, unsigned int, int const*, void*)@Base" 1.0.0+14.10.20140806.7
136- (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::PromptSessionVirtualTable::new_fd_for_prompt_provider()@Base" 0.0.1+14.10.20140717.8
137- (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::PromptSessionVirtualTable::PromptSessionVirtualTable()@Base" 1.0.0+14.10.20141001
138- (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::PromptSessionVirtualTable::PromptSessionVirtualTable(MirPromptSession*)@Base" 0.0.1+14.10.20140717.8
139- (c++)"core::trust::mir::connect(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.0.1+14.10.20140717.8
140- (c++)"core::trust::mir::create_agent_for_mir_connection(MirConnection*)@Base" 0.0.1+14.10.20140717.8
141- (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::Agent::on_trust_session_changed_state(MirPromptSession*, MirPromptSessionState, void*)@Base" 0.0.1+14.10.20140717.8
142- (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::Agent::authenticate_request_with_parameters(core::trust::Agent::RequestParameters const&)@Base" 1.0.0+14.10.20140806.7
143- (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::Agent::translator_only_accepting_exit_status_success()@Base" 0.0.1+14.10.20140717.8
144- (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::Agent::Agent(std::shared_ptr<core::trust::mir::ConnectionVirtualTable> const&, std::shared_ptr<core::trust::mir::PromptProviderHelper> const&, std::function<core::trust::Request::Answer (core::posix::wait::Result const&)> const&)@Base" 0.0.1+14.10.20140717.8
145- (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::Agent::~Agent()@Base" 0.0.1+14.10.20140717.8
146- (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::operator==(core::trust::mir::PromptProviderHelper::InvocationArguments const&, core::trust::mir::PromptProviderHelper::InvocationArguments const&)@Base" 0.0.1+14.10.20140717.8
147- (c++)"core::trust::dbus::create_per_user_agent_for_bus_connection(std::shared_ptr<core::dbus::Bus> const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.0.0+14.10.20140806.7
148- (c++)"core::trust::dbus::create_multi_user_agent_for_bus_connection(std::shared_ptr<core::dbus::Bus> const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.0.0+14.10.20140806.7
149- (c++)"core::trust::Agent::RequestParameters::~RequestParameters()@Base" 1.0.0+14.10.20140806.7
150- (c++)"core::trust::Store::Query::Errors::NoCurrentResult::~NoCurrentResult()@Base" 0.0.1+14.10.20140717.8
151- (c++)"core::trust::Store::Query::Errors::QueryIsInErrorState::~QueryIsInErrorState()@Base" 0.0.1+14.10.20140717.8
152- (c++)"core::trust::Store::Errors::ErrorResettingStore::~ErrorResettingStore()@Base" 0.0.1+14.10.20140626.1
153- (c++)"core::trust::remote::dbus::Agent::Stub::send(core::trust::Agent::RequestParameters const&)@Base" 1.0.0+14.10.20140806.7
154- (c++)"core::trust::remote::dbus::Agent::Stub::Stub(core::trust::remote::dbus::Agent::Stub::Configuration const&)@Base" 1.0.0+14.10.20140806.7
155- (c++)"core::trust::remote::dbus::Agent::Stub::~Stub()@Base" 1.0.0+14.10.20140806.7
156- (c++)"core::trust::remote::dbus::Agent::Skeleton::authenticate_request_with_parameters(core::trust::Agent::RequestParameters const&)@Base" 1.0.0+14.10.20140806.7
157- (c++)"core::trust::remote::dbus::Agent::Skeleton::Skeleton(core::trust::remote::dbus::Agent::Skeleton::Configuration const&)@Base" 1.0.0+14.10.20140806.7
158- (c++)"core::trust::remote::dbus::Agent::Skeleton::~Skeleton()@Base" 1.0.0+14.10.20140806.7
159- (c++)"core::trust::remote::Agent::Stub::authenticate_request_with_parameters(core::trust::Agent::RequestParameters const&)@Base" 1.0.0+14.10.20140806.7
160- (c++)"core::trust::remote::Agent::Skeleton::authenticate_request_with_parameters(core::trust::Agent::RequestParameters const&)@Base" 1.0.0+14.10.20140806.7
161- (c++)"core::trust::remote::Agent::Skeleton::Skeleton(std::shared_ptr<core::trust::Agent> const&)@Base" 1.0.0+14.10.20140806.7
162- (c++)"core::trust::remote::posix::Stub::start_accept()@Base" 1.0.0+14.10.20140806.7
163- (c++)"core::trust::remote::posix::Stub::on_new_session(boost::system::error_code const&, std::shared_ptr<core::trust::remote::posix::Stub::Session> const&)@Base" 1.0.0+14.10.20140806.7
164- (c++)"core::trust::remote::posix::Stub::create_stub_for_configuration(core::trust::remote::posix::Stub::Configuration const&)@Base" 1.0.0+14.10.20140806.7
165- (c++)"core::trust::remote::posix::Stub::get_sock_opt_credentials_resolver()@Base" 1.0.0+14.10.20140806.7
166- (c++)"core::trust::remote::posix::Stub::handle_error_from_socket_operation_for_uid(boost::system::error_code const&, core::trust::TaggedInteger<core::trust::tag::Uid, unsigned int>)@Base" 1.0.0+14.10.20140806.7
167- (c++)"core::trust::remote::posix::Stub::send(core::trust::Agent::RequestParameters const&)@Base" 1.0.0+14.10.20140806.7
168- (c++)"core::trust::remote::posix::Stub::Session::Registry::add_session_for_uid(core::trust::TaggedInteger<core::trust::tag::Uid, unsigned int>, std::shared_ptr<core::trust::remote::posix::Stub::Session>)@Base" 1.0.0+14.10.20140806.7
169- (c++)"core::trust::remote::posix::Stub::Session::Registry::remove_session_for_uid(core::trust::TaggedInteger<core::trust::tag::Uid, unsigned int>)@Base" 1.0.0+14.10.20140806.7
170- (c++)"core::trust::remote::posix::Stub::Session::Registry::resolve_session_for_uid(core::trust::TaggedInteger<core::trust::tag::Uid, unsigned int>)@Base" 1.0.0+14.10.20140806.7
171- (c++)"core::trust::remote::posix::Stub::Session::Session(boost::asio::io_service&)@Base" 1.0.0+14.10.20140806.7
172- (c++)"core::trust::remote::posix::Stub::Stub(core::trust::remote::posix::Stub::Configuration)@Base" 1.0.0+14.10.20140806.7
173- (c++)"core::trust::remote::posix::Stub::~Stub()@Base" 1.0.0+14.10.20140806.7
174- (c++)"core::trust::remote::posix::Skeleton::start_read()@Base" 1.0.0+14.10.20140806.7
175- (c++|arch=amd64 arm64 ppc64el)"core::trust::remote::posix::Skeleton::on_read_finished(boost::system::error_code const&, unsigned long)@Base" 1.0.0+14.10.20140806.7
176- (c++|arch=i386 armhf powerpc)"core::trust::remote::posix::Skeleton::on_read_finished(boost::system::error_code const&, unsigned int)@Base" 1.0.0+14.10.20140806.7
177- (c++)"core::trust::remote::posix::Skeleton::process_incoming_request(core::trust::remote::posix::Request const&)@Base" 1.0.0+14.10.20140806.7
178- (c++)"core::trust::remote::posix::Skeleton::create_skeleton_for_configuration(core::trust::remote::posix::Skeleton::Configuration const&)@Base" 1.0.0+14.10.20140806.7
179- (c++)"core::trust::remote::posix::Skeleton::Skeleton(core::trust::remote::posix::Skeleton::Configuration const&)@Base" 1.0.0+14.10.20140806.7
180- (c++)"core::trust::remote::posix::Skeleton::~Skeleton()@Base" 1.0.0+14.10.20140806.7
181- (c++)"core::trust::remote::helpers::proc_stat_start_time_resolver()@Base" 1.0.0+14.10.20140806.7
182- (c++)"core::trust::remote::helpers::aa_get_task_con_app_id_resolver()@Base" 1.0.0+14.10.20140806.7
183- (c++)"core::trust::operator==(core::trust::Agent::RequestParameters const&, core::trust::Agent::RequestParameters const&)@Base" 1.0.0+14.10.20140806.7
184- (c++)"core::trust::operator==(core::trust::Request const&, core::trust::Request const&)@Base" 0.0.1+14.10.20140626.1
185- (c++)"core::trust::operator<<(std::basic_ostream<char, std::char_traits<char> >&, core::trust::Request::Answer const&)@Base" 0.0.1+14.10.20140626.1
186- (c++)"core::trust::operator<<(std::basic_ostream<char, std::char_traits<char> >&, core::trust::Request const&)@Base" 0.0.1+14.10.20140626.1
187- (c++)"core::trust::remote::posix::Stub::has_session_for_uid(core::trust::TaggedInteger<core::trust::tag::Uid, unsigned int>) const@Base" 1.0.0+14.10.20140806.7
188- (c++)"core::trust::remote::posix::Stub::Session::Registry::has_session_for_uid(core::trust::TaggedInteger<core::trust::tag::Uid, unsigned int>) const@Base" 1.0.0+14.10.20140806.7
189- (c++)"typeinfo for core::trust::CachedAgent@Base" 1.0.0+14.10.20140806.7
190- (c++)"typeinfo for core::trust::CachedAgent::Reporter@Base" 1.0.0+14.10.20140814.1
191- (c++)"typeinfo for core::trust::CachedAgentGlogReporter@Base" 1.0.0+14.10.20140814.1
192- (c++)"typeinfo for core::trust::AppIdFormattingTrustAgent@Base" 1.0.0+14.10.20140826.1
193- (c++|arch=amd64 i386 armhf arm64)"typeinfo for core::trust::mir::PromptProviderHelper@Base" 0.0.1+14.10.20140717.8
194- (c++|arch=amd64 i386 armhf arm64)"typeinfo for core::trust::mir::ConnectionVirtualTable@Base" 0.0.1+14.10.20140717.8
195- (c++|arch=amd64 i386 armhf arm64)"typeinfo for core::trust::mir::PromptSessionVirtualTable@Base" 0.0.1+14.10.20140717.8
196- (c++|arch=amd64 i386 armhf arm64)"typeinfo for core::trust::mir::Agent@Base" 0.0.1+14.10.20140717.8
197- (c++)"typeinfo for core::trust::Agent::Registry@Base" 1.0.0+14.10.20140806.7
198- (c++)"typeinfo for core::trust::Agent@Base" 0.0.1+14.10.20140717.8
199- (c++)"typeinfo for core::trust::Store::Query::Errors::NoCurrentResult@Base" 0.0.1+14.10.20140717.8
200- (c++)"typeinfo for core::trust::Store::Query::Errors::QueryIsInErrorState@Base" 0.0.1+14.10.20140717.8
201- (c++)"typeinfo for core::trust::Store::Query@Base" 0.0.1+14.10.20140626.1
202- (c++)"typeinfo for core::trust::Store::Errors::ErrorResettingStore@Base" 0.0.1+14.10.20140626.1
203- (c++)"typeinfo for core::trust::Store@Base" 0.0.1+14.10.20140626.1
204- (c++)"typeinfo for core::trust::Token@Base" 0.0.1+14.10.20140626.1
205- (c++)"typeinfo for core::trust::remote::dbus::Agent::Stub@Base" 1.0.0+14.10.20140806.7
206- (c++)"typeinfo for core::trust::remote::dbus::Agent::Skeleton@Base" 1.0.0+14.10.20140806.7
207- (c++)"typeinfo for core::trust::remote::Agent::Stub@Base" 1.0.0+14.10.20140806.7
208- (c++)"typeinfo for core::trust::remote::Agent::Skeleton@Base" 1.0.0+14.10.20140806.7
209- (c++)"typeinfo for core::trust::remote::posix::Stub::Session::Registry@Base" 1.0.0+14.10.20140806.7
210- (c++)"typeinfo for core::trust::remote::posix::Stub@Base" 1.0.0+14.10.20140806.7
211- (c++)"typeinfo for core::trust::remote::posix::Skeleton@Base" 1.0.0+14.10.20140806.7
212- (c++)"typeinfo name for core::trust::CachedAgent@Base" 1.0.0+14.10.20140806.7
213- (c++)"typeinfo name for core::trust::CachedAgent::Reporter@Base" 1.0.0+14.10.20140814.1
214- (c++)"typeinfo name for core::trust::CachedAgentGlogReporter@Base" 1.0.0+14.10.20140814.1
215- (c++)"typeinfo name for core::trust::AppIdFormattingTrustAgent@Base" 1.0.0+14.10.20140826.1
216- (c++|arch=amd64 i386 armhf arm64)"typeinfo name for core::trust::mir::PromptProviderHelper@Base" 0.0.1+14.10.20140717.8
217- (c++|arch=amd64 i386 armhf arm64)"typeinfo name for core::trust::mir::ConnectionVirtualTable@Base" 0.0.1+14.10.20140717.8
218- (c++|arch=amd64 i386 armhf arm64)"typeinfo name for core::trust::mir::PromptSessionVirtualTable@Base" 0.0.1+14.10.20140717.8
219- (c++|arch=amd64 i386 armhf arm64)"typeinfo name for core::trust::mir::Agent@Base" 0.0.1+14.10.20140717.8
220- (c++)"typeinfo name for core::trust::Agent::Registry@Base" 1.0.0+14.10.20140806.7
221- (c++)"typeinfo name for core::trust::Agent@Base" 0.0.1+14.10.20140717.8
222- (c++)"typeinfo name for core::trust::Store::Query::Errors::NoCurrentResult@Base" 0.0.1+14.10.20140717.8
223- (c++)"typeinfo name for core::trust::Store::Query::Errors::QueryIsInErrorState@Base" 0.0.1+14.10.20140717.8
224- (c++)"typeinfo name for core::trust::Store::Query@Base" 0.0.1+14.10.20140626.1
225- (c++)"typeinfo name for core::trust::Store::Errors::ErrorResettingStore@Base" 0.0.1+14.10.20140626.1
226- (c++)"typeinfo name for core::trust::Store@Base" 0.0.1+14.10.20140626.1
227- (c++)"typeinfo name for core::trust::Token@Base" 0.0.1+14.10.20140626.1
228- (c++)"typeinfo name for core::trust::remote::dbus::Agent::Stub@Base" 1.0.0+14.10.20140806.7
229- (c++)"typeinfo name for core::trust::remote::dbus::Agent::Skeleton@Base" 1.0.0+14.10.20140806.7
230- (c++)"typeinfo name for core::trust::remote::Agent::Stub@Base" 1.0.0+14.10.20140806.7
231- (c++)"typeinfo name for core::trust::remote::Agent::Skeleton@Base" 1.0.0+14.10.20140806.7
232- (c++)"typeinfo name for core::trust::remote::posix::Stub::Session::Registry@Base" 1.0.0+14.10.20140806.7
233- (c++)"typeinfo name for core::trust::remote::posix::Stub@Base" 1.0.0+14.10.20140806.7
234- (c++)"typeinfo name for core::trust::remote::posix::Skeleton@Base" 1.0.0+14.10.20140806.7
235- (c++)"vtable for core::trust::CachedAgent::Reporter@Base" 1.0.0+14.10.20140814.1
236- (c++)"vtable for core::trust::CachedAgent@Base" 1.0.0+14.10.20140806.7
237- (c++)"vtable for core::trust::CachedAgentGlogReporter@Base" 1.0.0+14.10.20140814.1
238- (c++)"vtable for core::trust::AppIdFormattingTrustAgent@Base" 1.0.0+14.10.20140826.1
239- (c++|arch=amd64 i386 armhf arm64)"vtable for core::trust::mir::PromptProviderHelper@Base" 0.0.1+14.10.20140717.8
240- (c++|arch=amd64 i386 armhf arm64)"vtable for core::trust::mir::ConnectionVirtualTable@Base" 0.0.1+14.10.20140717.8
241- (c++|arch=amd64 i386 armhf arm64)"vtable for core::trust::mir::PromptSessionVirtualTable@Base" 0.0.1+14.10.20140717.8
242- (c++|arch=amd64 i386 armhf arm64)"vtable for core::trust::mir::Agent@Base" 0.0.1+14.10.20140717.8
243- (c++)"vtable for core::trust::Agent::Registry@Base" 1.0.0+14.10.20140806.7
244- (c++)"vtable for core::trust::Agent@Base" 0.0.1+14.10.20140717.8
245- (c++)"vtable for core::trust::Store::Query::Errors::NoCurrentResult@Base" 0.0.1+14.10.20140717.8
246- (c++)"vtable for core::trust::Store::Query::Errors::QueryIsInErrorState@Base" 0.0.1+14.10.20140717.8
247- (c++)"vtable for core::trust::Store::Query@Base" 0.0.1+14.10.20140626.1
248- (c++)"vtable for core::trust::Store::Errors::ErrorResettingStore@Base" 0.0.1+14.10.20140626.1
249- (c++)"vtable for core::trust::Store@Base" 0.0.1+14.10.20140626.1
250- (c++)"vtable for core::trust::Token@Base" 0.0.1+14.10.20140626.1
251- (c++)"vtable for core::trust::remote::dbus::Agent::Stub@Base" 1.0.0+14.10.20140806.7
252- (c++)"vtable for core::trust::remote::dbus::Agent::Skeleton@Base" 1.0.0+14.10.20140806.7
253- (c++)"vtable for core::trust::remote::Agent::Stub@Base" 1.0.0+14.10.20140806.7
254- (c++)"vtable for core::trust::remote::Agent::Skeleton@Base" 1.0.0+14.10.20140806.7
255- (c++)"vtable for core::trust::remote::posix::Stub::Session::Registry@Base" 1.0.0+14.10.20140806.7
256- (c++)"vtable for core::trust::remote::posix::Stub@Base" 1.0.0+14.10.20140806.7
257- (c++)"vtable for core::trust::remote::posix::Skeleton@Base" 1.0.0+14.10.20140806.7
258
259=== renamed file 'debian/libtrust-store1.install' => 'debian/libtrust-store2.install'
260=== modified file 'debian/rules'
261--- debian/rules 2014-08-06 11:22:28 +0000
262+++ debian/rules 2015-07-23 08:28:52 +0000
263@@ -5,11 +5,6 @@
264
265 include /usr/share/dpkg/default.mk
266
267-# Explicitly selecting a G{CC,++}-version here to avoid accidental
268-# ABI breaks introduced by toolchain updates.
269-export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
270-export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
271-
272 # Mir is an optional build dependency
273 ifneq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 i386 armhf))
274 TRUST_STORE_MIR_AGENT_ENABLED = ON
275@@ -24,4 +19,4 @@
276 dh $@ --fail-missing
277
278 override_dh_auto_configure:
279- dh_auto_configure -- -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX) -DTRUST_STORE_MIR_AGENT_ENABLED=$(TRUST_STORE_MIR_AGENT_ENABLED)
280+ dh_auto_configure -- -DTRUST_STORE_MIR_AGENT_ENABLED=$(TRUST_STORE_MIR_AGENT_ENABLED)
281
282=== modified file 'src/core/trust/mir/agent.cpp'
283--- src/core/trust/mir/agent.cpp 2014-10-07 19:27:18 +0000
284+++ src/core/trust/mir/agent.cpp 2015-07-23 08:28:52 +0000
285@@ -96,7 +96,7 @@
286 mir::ConnectionVirtualTable::ConnectionVirtualTable(MirConnection* connection)
287 : connection{connection}
288 {
289- if (mir_connection_is_valid(connection) == mir_false) throw InvalidMirConnection
290+ if (not mir_connection_is_valid(connection)) throw InvalidMirConnection
291 {
292 "Cannot create instance for invalid connection to Mir."
293 };
294
295=== modified file 'src/core/trust/mir/prompt_main.cpp'
296--- src/core/trust/mir/prompt_main.cpp 2015-02-13 12:07:56 +0000
297+++ src/core/trust/mir/prompt_main.cpp 2015-07-23 08:28:52 +0000
298@@ -39,6 +39,8 @@
299 #include "prompt_config.h"
300 #include "prompt_main.h"
301
302+#include <iostream>
303+
304 namespace cli = core::trust::mir::cli;
305 namespace env = core::trust::mir::env;
306

Subscribers

People subscribed via source and target branches