trust-store

Merge lp:~thomas-voss/trust-store/explicit-gcc-version into lp:trust-store

  1. explicit-gcc-version
  2. Merge into trunk
Proposed by Thomas Voß
Status: Merged
Approved by: Thomas Voß
Approved revision: 20
Merged at revision: 22
Proposed branch: lp:~thomas-voss/trust-store/explicit-gcc-version
Merge into: lp:trust-store
Diff against target: 117 lines (+27/-11)
6 files modified
CMakeLists.txt (+2/-2)
debian/changelog (+6/-0)
debian/control (+7/-3)
debian/libtrust-store1.symbols (+1/-1)
debian/rules (+11/-0)
tests/request_processor_test.cpp (+0/-5)
To merge this branch: bzr merge lp:~thomas-voss/trust-store/explicit-gcc-version
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Colin Watson Approve
Matthias Klose Pending
Review via email: mp+224769@code.launchpad.net

Commit message

Bump major revision and so name to account for toolchain update.

Description of the change

Bump major revision and so name to account for toolchain update.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

I'd suggest versioning the build-dependencies on libdbus-cpp-dev and libprocess-cpp-dev, but otherwise fine.

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

FAILED: Continuous integration, rev:17
http://jenkins.qa.ubuntu.com/job/trust-store-ci/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-amd64-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-armhf-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-i386-ci/4/console

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

review: Needs Fixing (continuous-integration)
lp:~thomas-voss/trust-store/explicit-gcc-version updated
18. By Thomas Voß

[ Ubuntu daily release ]
* debian/*symbols: auto-update new symbols to released version
[ thomas-voss ]
* Provide an agent implementation that leverages Mir's trusted
  prompting API. Introduce a default prompt provider using Qt/QML.
  Provide a test harness around the core::trust::mir::Agent
  implementation and the prompt provider. Add a convenience function
  for processing incoming requests.
[ thomas-voss ]
* Remove obsolete data/session.conf and data/system.conf files. Adjust
  directory creation default mode to 0755. (LP: #1338587)
[ Ubuntu daily release ]
* New rebuild forced

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

FAILED: Continuous integration, rev:18
http://jenkins.qa.ubuntu.com/job/trust-store-ci/17/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-amd64-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-armhf-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-i386-ci/17/console

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

review: Needs Fixing (continuous-integration)
lp:~thomas-voss/trust-store/explicit-gcc-version updated
19. By Thomas Voß

Add versioned build-dep on dbus-cpp.

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

FAILED: Continuous integration, rev:19
http://jenkins.qa.ubuntu.com/job/trust-store-ci/18/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-amd64-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-armhf-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-i386-ci/18/console

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

review: Needs Fixing (continuous-integration)
lp:~thomas-voss/trust-store/explicit-gcc-version updated
20. By Thomas Voß

Remove unused function.

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

FAILED: Continuous integration, rev:20
http://jenkins.qa.ubuntu.com/job/trust-store-ci/19/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-amd64-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-armhf-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-i386-ci/19/console

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

review: Needs Fixing (continuous-integration)

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-07-15 10:14:45 +0000
3+++ CMakeLists.txt 2014-07-18 15:25:44 +0000
4@@ -34,9 +34,9 @@
5 pkg_check_modules(MIR_COMMON mircommon REQUIRED)
6 pkg_check_modules(PROCESS_CPP process-cpp REQUIRED)
7
8-set(TRUST_STORE_VERSION_MAJOR 0)
9+set(TRUST_STORE_VERSION_MAJOR 1)
10 set(TRUST_STORE_VERSION_MINOR 0)
11-set(TRUST_STORE_VERSION_PATCH 1)
12+set(TRUST_STORE_VERSION_PATCH 0)
13
14 include(CTest)
15
16
17=== modified file 'debian/changelog'
18--- debian/changelog 2014-07-17 18:45:56 +0000
19+++ debian/changelog 2014-07-18 15:25:44 +0000
20@@ -1,3 +1,9 @@
21+trust-store (1.0.0) UNRELEASED; urgency=medium
22+
23+ * Bump major revision and so name to account for toolchain update.
24+
25+ -- Thomas Voß <thomas.voss@canonical.com> Fri, 27 Jun 2014 10:46:20 +0200
26+
27 trust-store (0.0.1+14.10.20140717.8-0ubuntu1) utopic; urgency=low
28
29 [ Ubuntu daily release ]
30
31=== modified file 'debian/control'
32--- debian/control 2014-07-17 18:40:43 +0000
33+++ debian/control 2014-07-18 15:25:44 +0000
34@@ -7,9 +7,13 @@
35 google-mock,
36 gcovr,
37 graphviz,
38+# We rely on C++11 features, and to prevent from ABI breaks
39+# in libstdc++ causing us issues, we explicitly select a G++
40+# version.
41+ g++-4.9,
42 libboost-program-options-dev,
43 libboost-system-dev,
44- libdbus-cpp-dev,
45+ libdbus-cpp-dev (>= 4.0.0),
46 libdbus-1-dev,
47 libgtest-dev,
48 libjson-c-dev,
49@@ -29,7 +33,7 @@
50 # upstream branch
51 Vcs-Bzr: lp:trust-store
52
53-Package: libtrust-store0
54+Package: libtrust-store1
55 Architecture: any
56 Multi-Arch: same
57 Pre-Depends: ${misc:Pre-Depends},
58@@ -47,7 +51,7 @@
59 Multi-Arch: same
60 Pre-Depends: ${misc:Pre-Depends},
61 Recommends: libtrust-store-doc,
62-Depends: libtrust-store0 (= ${binary:Version}),
63+Depends: libtrust-store1 (= ${binary:Version}),
64 ${misc:Depends},
65 Description: C++11 library for persisting trust requests - dev files
66 Provides a common implementation of a trust store to be used by trusted
67
68=== renamed file 'debian/libtrust-store0.install' => 'debian/libtrust-store1.install'
69=== renamed file 'debian/libtrust-store0.symbols' => 'debian/libtrust-store1.symbols'
70--- debian/libtrust-store0.symbols 2014-07-17 18:45:52 +0000
71+++ debian/libtrust-store1.symbols 2014-07-18 15:25:44 +0000
72@@ -1,4 +1,4 @@
73-libtrust-store.so.0 libtrust-store0 #MINVER#
74+libtrust-store.so.1 libtrust-store1 #MINVER#
75 (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
76 (c++)"core::trust::process_trust_request(core::trust::RequestParameters const&)@Base" 0.0.1+14.10.20140717.8
77 (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
78
79=== modified file 'debian/rules'
80--- debian/rules 2014-06-26 08:10:37 +0000
81+++ debian/rules 2014-07-18 15:25:44 +0000
82@@ -2,8 +2,19 @@
83 # -*- makefile -*-
84
85 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
86+
87+include /usr/share/dpkg/default.mk
88+
89+# Explicitly selecting a G{CC,++}-version here to avoid accidental
90+# ABI breaks introduced by toolchain updates.
91+export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
92+export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
93+
94 # The home directory of user buildd does not exist on the builders
95 export XDG_DATA_HOME=/tmp
96
97 %:
98 dh $@ --fail-missing
99+
100+override_dh_auto_configure:
101+ dh_auto_configure -- -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)
102
103=== modified file 'tests/request_processor_test.cpp'
104--- tests/request_processor_test.cpp 2014-07-14 16:05:37 +0000
105+++ tests/request_processor_test.cpp 2014-07-18 15:25:44 +0000
106@@ -118,11 +118,6 @@
107 return std::make_shared<testing::NiceMock<MockStore>>();
108 }
109
110-std::shared_ptr<core::trust::Store::Query> a_null_query()
111-{
112- return std::shared_ptr<core::trust::Store::Query>{};
113-}
114-
115 std::shared_ptr<testing::NiceMock<MockStore::MockQuery>> a_mocked_query()
116 {
117 return std::make_shared<testing::NiceMock<MockStore::MockQuery>>();

Subscribers

People subscribed via source and target branches