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

Proposed by Alfonso Sanchez-Beato on 2015-08-31
Status: Needs review
Proposed branch: lp:~thomas-voss/trust-store/fix-1452341
Merge into: lp:trust-store
Diff against target: 161 lines (+36/-13) (has conflicts)
6 files modified
CMakeLists.txt (+2/-2)
debian/changelog (+9/-0)
debian/control (+5/-11)
debian/rules (+14/-0)
src/core/trust/mir/agent.cpp (+4/-0)
src/core/trust/mir/prompt_main.cpp (+2/-0)
Text conflict in debian/changelog
Contents conflict in debian/libtrust-store1.symbols
Text conflict in debian/rules
Text conflict in src/core/trust/mir/agent.cpp
To merge this branch: bzr merge lp:~thomas-voss/trust-store/fix-1452341
Reviewer Review Type Date Requested Status
Pete Woods 2015-08-31 Pending
PS Jenkins bot continuous-integration 2015-08-31 Pending
Marcus Tomlinson 2015-08-31 Pending
Michael Vogt 2015-08-31 Pending
Review via email: mp+269636@code.launchpad.net

This proposal supersedes a proposal from 2015-07-23.

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.
Pete Woods (pete-woods) wrote : Posted in a previous version of this proposal

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

review: Approve
Marcus Tomlinson (marcustomlinson) wrote : Posted in a previous version of this proposal

Very OCD I know:

86 Description: Test files for libtrust-store1

"libtrust-store2" now

Marcus Tomlinson (marcustomlinson) wrote : Posted in a previous version of this proposal

Top approving again to mark rev.108 as approved.

review: Approve
Michael Vogt (mvo) wrote : Posted in a previous version of this proposal

Looks good to me.

review: Approve

Unmerged revisions

108. By Thomas Voß on 2015-07-23

Fix package name in description.

107. By Thomas Voß on 2015-07-23

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

106. By Thomas Voß on 2015-07-23

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

105. By Launchpad Translations on behalf of phablet-team on 2015-06-29

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 2015-06-28 19:45:49 +0000
3+++ CMakeLists.txt 2015-08-31 12:44:42 +0000
4@@ -46,8 +46,8 @@
5 pkg_check_modules(GLOG libglog REQUIRED)
6 pkg_check_modules(PROCESS_CPP process-cpp REQUIRED)
7
8-set(TRUST_STORE_VERSION_MAJOR 1)
9-set(TRUST_STORE_VERSION_MINOR 1)
10+set(TRUST_STORE_VERSION_MAJOR 2)
11+set(TRUST_STORE_VERSION_MINOR 0)
12 set(TRUST_STORE_VERSION_PATCH 0)
13
14 include(CTest)
15
16=== modified file 'debian/changelog'
17--- debian/changelog 2015-08-20 18:19:05 +0000
18+++ debian/changelog 2015-08-31 12:44:42 +0000
19@@ -1,3 +1,4 @@
20+<<<<<<< TREE
21 trust-store (1.1.0+15.04.20150820-0ubuntu1) vivid; urgency=medium
22
23 [ Ken VanDine ]
24@@ -28,6 +29,14 @@
25
26 -- CI Train Bot <ci-train-bot@canonical.com> Mon, 29 Jun 2015 05:00:16 +0000
27
28+=======
29+trust-store (2.0.0) wily; urgency=medium
30+
31+ * Bump major revision to account for toolchain update. Fixes LP:#1452341
32+
33+ -- Thomas Voß <thomas.voss@canonical.com> Thu, 23 Jul 2015 09:22:15 +0200
34+
35+>>>>>>> MERGE-SOURCE
36 trust-store (1.1.0+15.04.20150213-0ubuntu1) vivid; urgency=medium
37
38 [ thomas-voss ]
39
40=== modified file 'debian/control'
41--- debian/control 2015-06-28 19:45:49 +0000
42+++ debian/control 2015-08-31 12:44:42 +0000
43@@ -6,10 +6,6 @@
44 doxygen,
45 google-mock,
46 graphviz,
47-# We rely on C++11 features, and to prevent from ABI breaks
48-# in libstdc++ causing us issues, we explicitly select a G++
49-# version.
50- g++-4.9,
51 libapparmor-dev,
52 libboost-program-options-dev,
53 libboost-system-dev,
54@@ -33,7 +29,7 @@
55 # upstream branch
56 Vcs-Bzr: lp:trust-store
57
58-Package: libtrust-store1
59+Package: libtrust-store2
60 Architecture: any
61 Multi-Arch: same
62 Pre-Depends: ${misc:Pre-Depends},
63@@ -51,7 +47,7 @@
64 Multi-Arch: same
65 Pre-Depends: ${misc:Pre-Depends},
66 Recommends: libtrust-store-doc,
67-Depends: libtrust-store1 (= ${binary:Version}),
68+Depends: libtrust-store2 (= ${binary:Version}),
69 ${misc:Depends},
70 Description: C++11 library for persisting trust requests - dev files
71 Provides a common implementation of a trust store to be used by trusted
72@@ -63,10 +59,8 @@
73 Package: trust-store-bin
74 Section: devel
75 Architecture: any
76-Depends: libtrust-store1 (= ${binary:Version}),
77+Depends: libtrust-store2 (= ${binary:Version}),
78 ${misc:Depends},
79-Replaces: libtrust-store1 (<< 1.1.0+14.10.20141008),
80-Breaks: libtrust-store1 (<< 1.1.0+14.10.20141008),
81 Description: Daemon binaries to be used by services.
82 Provides a common implementation of a trust store to be used by trusted
83 helpers.
84@@ -76,10 +70,10 @@
85 Package: trust-store-tests
86 Section: libdevel
87 Architecture: any
88-Depends: libtrust-store1 (= ${binary:Version}),
89+Depends: libtrust-store2 (= ${binary:Version}),
90 ${misc:Depends},
91 Suggests: libtrust-store-dev,
92-Description: Test files for libtrust-store1
93+Description: Test files for libtrust-store2
94 Provides a common implementation of a trust store to be used by trusted
95 helpers.
96 .
97
98=== renamed file 'debian/libtrust-store1.symbols' => 'debian/libtrust-store1.symbols.THIS'
99=== renamed file 'debian/libtrust-store1.install' => 'debian/libtrust-store2.install'
100=== modified file 'debian/rules'
101--- debian/rules 2015-06-25 19:36:42 +0000
102+++ debian/rules 2015-08-31 12:44:42 +0000
103@@ -5,11 +5,21 @@
104
105 include /usr/share/dpkg/default.mk
106
107+<<<<<<< TREE
108 # Explicitly selecting a G{CC,++}-version here to avoid accidental
109 # ABI breaks introduced by toolchain updates.
110 export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
111 export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
112
113+=======
114+# Mir is an optional build dependency
115+ifneq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 i386 armhf))
116+ TRUST_STORE_MIR_AGENT_ENABLED = ON
117+else
118+ TRUST_STORE_MIR_AGENT_ENABLED = OFF
119+endif
120+
121+>>>>>>> MERGE-SOURCE
122 # The home directory of user buildd does not exist on the builders
123 export XDG_DATA_HOME=/tmp
124
125@@ -17,4 +27,8 @@
126 dh $@ --fail-missing
127
128 override_dh_auto_configure:
129+<<<<<<< TREE
130 dh_auto_configure -- -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX) -DTRUST_STORE_MIR_AGENT_ENABLED=ON
131+=======
132+ dh_auto_configure -- -DTRUST_STORE_MIR_AGENT_ENABLED=$(TRUST_STORE_MIR_AGENT_ENABLED)
133+>>>>>>> MERGE-SOURCE
134
135=== modified file 'src/core/trust/mir/agent.cpp'
136--- src/core/trust/mir/agent.cpp 2015-06-25 19:44:47 +0000
137+++ src/core/trust/mir/agent.cpp 2015-08-31 12:44:42 +0000
138@@ -96,7 +96,11 @@
139 mir::ConnectionVirtualTable::ConnectionVirtualTable(MirConnection* connection)
140 : connection{connection}
141 {
142+<<<<<<< TREE
143 if (!mir_connection_is_valid(connection)) throw InvalidMirConnection
144+=======
145+ if (not mir_connection_is_valid(connection)) throw InvalidMirConnection
146+>>>>>>> MERGE-SOURCE
147 {
148 "Cannot create instance for invalid connection to Mir."
149 };
150
151=== modified file 'src/core/trust/mir/prompt_main.cpp'
152--- src/core/trust/mir/prompt_main.cpp 2015-02-13 12:07:56 +0000
153+++ src/core/trust/mir/prompt_main.cpp 2015-08-31 12:44:42 +0000
154@@ -39,6 +39,8 @@
155 #include "prompt_config.h"
156 #include "prompt_main.h"
157
158+#include <iostream>
159+
160 namespace cli = core::trust::mir::cli;
161 namespace env = core::trust::mir::env;
162

Subscribers

People subscribed via source and target branches