unity-scopes-shell

Merge lp:~stolowski/unity-scopes-shell/singletree into lp:unity-scopes-shell

  1. singletree
  2. Merge into trunk
Proposed by Paweł Stołowski on 2015-09-16
Status: Merged
Approved by: Marcus Tomlinson on 2015-09-22
Approved revision: 277
Merged at revision: 253
Proposed branch: lp:~stolowski/unity-scopes-shell/singletree
Merge into: lp:unity-scopes-shell
Diff against target: 706 lines (+263/-168)
11 files modified
CMakeLists.txt (+16/-0)
debian/HARNESS_VERSION (+1/-0)
debian/control (+9/-76)
debian/control.in (+85/-0)
debian/gen-debian-files.sh (+58/-0)
debian/libscope-harness.install.in (+1/-0)
debian/libscope-harness.symbols.in (+85/-84)
debian/rules (+4/-0)
debian/shlibs.in (+1/-0)
src/Unity/scope.cpp (+0/-1)
src/scope-harness/CMakeLists.txt (+3/-7)
To merge this branch: bzr merge lp:~stolowski/unity-scopes-shell/singletree
Reviewer Review Type Date Requested Status
Marcus Tomlinson (community) 2015-09-16 Approve on 2015-09-22
PS Jenkins bot continuous-integration Approve on 2015-09-18
Review via email: mp+271314@code.launchpad.net

Commit Message

Single tree for both wily and vivid - use symbols file for scope harness in vivid and shlibs for wily and generate control file from control.in and .install file accordingly.

Description of the Change

Single tree for both wily and vivid - use symbols file for scope harness in vivid and shlibs for wily and generate control file from control.in and .install file accordingly.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Marcus Tomlinson (marcustomlinson) wrote :

Looks good. Seems everything is dual building fine, just needs to be tested on the device on vivid and wily. So, approved in principle, pending some testing :)

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Marcus Tomlinson (marcustomlinson) wrote :

Thanks for picking up that symbols mistake!

review: Approve

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-08-24 14:07:03 +0000
3+++ CMakeLists.txt 2015-09-18 13:58:53 +0000
4@@ -80,6 +80,22 @@
5 option(Werror "Treat warnings as errors" OFF)
6 endif()
7
8+# Check the distribution we are building for, set scope harness version and so accordingly
9+execute_process(COMMAND lsb_release -c -s OUTPUT_VARIABLE DISTRIBUTION OUTPUT_STRIP_TRAILING_WHITESPACE)
10+file(READ debian/HARNESS_VERSION HARNESS_FULL_VERSION)
11+string(STRIP ${HARNESS_FULL_VERSION} HARNESS_FULL_VERSION)
12+
13+# Parse out the three components.
14+STRING(REGEX MATCHALL "[0-9]+" full_version_components ${HARNESS_FULL_VERSION})
15+LIST(GET full_version_components 0 HARNESS_MAJOR)
16+LIST(GET full_version_components 1 HARNESS_MINOR)
17+LIST(GET full_version_components 2 HARNESS_MICRO)
18+
19+set(HARNESS_SO_VERSION ${HARNESS_MAJOR})
20+if(NOT ${DISTRIBUTION} MATCHES "vivid")
21+ math(EXPR HARNESS_SO_VERSION "${HARNESS_SO_VERSION} + 1")
22+endif()
23+
24 if (Werror)
25 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
26 endif()
27
28=== added file 'debian/HARNESS_VERSION'
29--- debian/HARNESS_VERSION 1970-01-01 00:00:00 +0000
30+++ debian/HARNESS_VERSION 2015-09-18 13:58:53 +0000
31@@ -0,0 +1,1 @@
32+1.1.0
33
34=== modified file 'debian/control'
35--- debian/control 2015-08-24 14:06:00 +0000
36+++ debian/control 2015-09-18 13:58:53 +0000
37@@ -1,84 +1,17 @@
38+# This file is autogenerated. DO NOT EDIT!
39+#
40+# Modifications should be made to debian/control.in instead.
41+# This file is regenerated automatically in the clean target.
42+#
43 Source: unity-scopes-shell
44-Priority: optional
45 Section: libs
46-Build-Depends: cmake,
47- cmake-extras (>= 0.4),
48- debhelper (>= 9),
49- dh-python,
50- libboost-python-dev,
51- libboost-regex-dev,
52- libunity-api-dev (>= 7.99),
53- libunity-scopes-dev (>= 1.0.1~),
54- libgsettings-qt-dev (>= 0.1),
55- libqtdbustest1-dev (>= 0.2),
56- libqtdbusmock1-dev (>= 0.2),
57- libubuntu-location-service-dev (>= 2.0.1),
58- pkg-config,
59- python3-dev,
60- python-tornado,
61- python3-sphinx,
62- qt5-default,
63- qtdeclarative5-dev,
64- qtdeclarative5-dev-tools,
65- qtdeclarative5-qtquick2-plugin,
66- unity-schemas (>= 7.3.1),
67- libonline-accounts-client-dev,
68- intltool,
69+Build-Depends: debhelper (>= 9),
70+ lsb-release,
71 Standards-Version: 3.9.5
72 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
73-Homepage: https://launchpad.net/unity-scopes-shell
74-# if you don't have have commit access to this branch but would like to upload
75-# directly to Ubuntu, don't worry: your changes will be merged back into the
76-# upstream branch
77-Vcs-Bzr: lp:unity-scopes-shell
78-Vcs-Browser: https://code.launchpad.net/unity-scopes-shell
79-X-Python3-Version: >= 3.4
80
81 Package: unity-plugin-scopes
82 Architecture: any
83 Multi-Arch: same
84-Pre-Depends: ${misc:Pre-Depends}
85-Depends: ${misc:Depends},
86- ${shlibs:Depends},
87- unity-schemas (>= 7.3.1),
88-Provides: unity-scopes-impl,
89- unity-scopes-impl-0,
90- unity-scopes-impl-1,
91- unity-scopes-impl-4,
92- unity-scopes-impl-6,
93- unity-scopes-impl-7,
94-Breaks: unity8-private (<< 7.84),
95- unity8 (<< 8.11)
96-Replaces: unity8-private (<< 7.84)
97-Description: QML plugin for Scopes
98- Plugin to integrate scopes with the Unity shell
99-
100-Package: libscope-harness1
101-Section: libdevel
102-Architecture: any
103-Multi-Arch: same
104-Depends: ${misc:Depends},
105- ${shlibs:Depends},
106-Description: Test harness for Unity scopes
107- Drive Unity scopes with a simple synchronous API. Make assertions
108- about results. Runtime library.
109-
110-Package: libscope-harness-dev
111-Section: libdevel
112-Architecture: any
113-Multi-Arch: same
114-Depends: ${misc:Depends},
115- ${shlibs:Depends},
116- libscope-harness1 (= ${binary:Version})
117-Description: Test harness for Unity scopes
118- Drive Unity scopes with a simple synchronous API. Make assertions
119- about results. Development files.
120-
121-Package: python3-scope-harness
122-Architecture: any
123-Depends: ${python3:Depends},
124- ${shlibs:Depends},
125- ${misc:Depends}
126-Description: Python bindings for Unity scopes test harness
127- Drive Unity scopes with a simple synchronous API. Make assertions
128- about results. Python bindings.
129+Description: This not the real control file because it is generated during the build from control.in.
130+
131
132=== added file 'debian/control.in'
133--- debian/control.in 1970-01-01 00:00:00 +0000
134+++ debian/control.in 2015-09-18 13:58:53 +0000
135@@ -0,0 +1,85 @@
136+Source: unity-scopes-shell
137+Priority: optional
138+Section: libs
139+Build-Depends: cmake,
140+ cmake-extras (>= 0.4),
141+ debhelper (>= 9),
142+ lsb-release,
143+ dh-python,
144+ libboost-python-dev,
145+ libboost-regex-dev,
146+ libunity-api-dev (>= 7.99),
147+ libunity-scopes-dev (>= 1.0.1~),
148+ libgsettings-qt-dev (>= 0.1),
149+ libqtdbustest1-dev (>= 0.2),
150+ libqtdbusmock1-dev (>= 0.2),
151+ libubuntu-location-service-dev (>= 2.0.1),
152+ pkg-config,
153+ python3-dev,
154+ python-tornado,
155+ python3-sphinx,
156+ qt5-default,
157+ qtdeclarative5-dev,
158+ qtdeclarative5-dev-tools,
159+ qtdeclarative5-qtquick2-plugin,
160+ unity-schemas (>= 7.3.1),
161+ libonline-accounts-client-dev,
162+ intltool,
163+Standards-Version: 3.9.5
164+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
165+Homepage: https://launchpad.net/unity-scopes-shell
166+# if you don't have have commit access to this branch but would like to upload
167+# directly to Ubuntu, don't worry: your changes will be merged back into the
168+# upstream branch
169+Vcs-Bzr: lp:unity-scopes-shell
170+Vcs-Browser: https://code.launchpad.net/unity-scopes-shell
171+X-Python3-Version: >= 3.4
172+
173+Package: unity-plugin-scopes
174+Architecture: any
175+Multi-Arch: same
176+Pre-Depends: ${misc:Pre-Depends}
177+Depends: ${misc:Depends},
178+ ${shlibs:Depends},
179+ unity-schemas (>= 7.3.1),
180+Provides: unity-scopes-impl,
181+ unity-scopes-impl-0,
182+ unity-scopes-impl-1,
183+ unity-scopes-impl-4,
184+ unity-scopes-impl-6,
185+ unity-scopes-impl-7,
186+Breaks: unity8-private (<< 7.84),
187+ unity8 (<< 8.11)
188+Replaces: unity8-private (<< 7.84)
189+Description: QML plugin for Scopes
190+ Plugin to integrate scopes with the Unity shell
191+
192+Package: libscope-harness@HARNESS_SO_VERSION@
193+Section: libdevel
194+Architecture: any
195+Multi-Arch: same
196+Depends: ${misc:Depends},
197+ ${shlibs:Depends},
198+Description: Test harness for Unity scopes
199+ Drive Unity scopes with a simple synchronous API. Make assertions
200+ about results. Runtime library.
201+
202+Package: libscope-harness-dev
203+Section: libdevel
204+Architecture: any
205+Multi-Arch: same
206+Depends: ${misc:Depends},
207+ ${shlibs:Depends},
208+ libscope-harness@HARNESS_SO_VERSION@ (= ${binary:Version})
209+Description: Test harness for Unity scopes
210+ Drive Unity scopes with a simple synchronous API. Make assertions
211+ about results. Development files.
212+
213+Package: python3-scope-harness
214+Architecture: any
215+Depends: ${python3:Depends},
216+ ${shlibs:Depends},
217+ ${misc:Depends}
218+Description: Python bindings for Unity scopes test harness
219+ Drive Unity scopes with a simple synchronous API. Make assertions
220+ about results. Python bindings.
221
222=== added file 'debian/gen-debian-files.sh'
223--- debian/gen-debian-files.sh 1970-01-01 00:00:00 +0000
224+++ debian/gen-debian-files.sh 2015-09-18 13:58:53 +0000
225@@ -0,0 +1,58 @@
226+#!/bin/sh
227+
228+# Copyright (C) 2015 Canonical Ltd
229+#
230+# This program is free software: you can redistribute it and/or modify
231+# it under the terms of the GNU Lesser General Public License version 3 as
232+# published by the Free Software Foundation.
233+#
234+# This program is distributed in the hope that it will be useful,
235+# but WITHOUT ANY WARRANTY; without even the implied warranty of
236+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
237+# GNU Lesser General Public License for more details.
238+#
239+# You should have received a copy of the GNU Lesser General Public License
240+# along with this program. If not, see <http://www.gnu.org/licenses/>.
241+#
242+# Authored by: Pawel Stolowski <pawel.stolowski@canonical.com>
243+
244+#
245+# This script is called from debian/rules and sets:
246+# - symbols file for vivid
247+# - shlibs for wily
248+# - control file and libscope-harness .install file
249+# to allow for a single source tree and dual landings for vivid/wily.
250+#
251+
252+set -e # Fail if any command fails.
253+
254+[ $# -ne 0 ] && {
255+ echo "usage: $(basename $0)" >&2
256+ exit 1
257+}
258+dir=./debian
259+
260+distro=$(lsb_release -c -s)
261+echo "gen-debian-files: detected distribution: $distro"
262+
263+harness_full_version=$(cat "${dir}"/HARNESS_VERSION)
264+major=$(echo $harness_full_version | cut -d'.' -f1)
265+minor=$(echo $harness_full_version | cut -d'.' -f2)
266+harness_major_minor="${major}.${minor}"
267+
268+harness_so_ver=$major
269+if [ "$distro" = "vivid" ]
270+then
271+ infile="${dir}/libscope-harness.symbols.in"
272+ outfile="${dir}"/libscope-harness${harness_so_ver}.symbols
273+ cat "${infile}" | sed -e "s/@HARNESS_SO_VERSION@/${harness_so_ver}/g" > "${outfile}"
274+else
275+ harness_so_ver=$(expr $major + 1)
276+ infile="${dir}"/shlibs.in
277+ outfile="${dir}"/shlibs
278+ cat "$infile" | sed -e "s/HARNESS_SO_VERSION@/${harness_so_ver}/g" \
279+ -e "s/HARNESS_MAJORMINOR/${harness_major_minor}/g" > "$outfile"
280+fi
281+
282+cat "${dir}/control.in" | sed -e "s/@HARNESS_SO_VERSION@/${harness_so_ver}/g" > "${dir}/control"
283+cp "${dir}/libscope-harness.install.in" "${dir}/libscope-harness${harness_so_ver}.install"
284
285=== added file 'debian/libscope-harness.install.in'
286--- debian/libscope-harness.install.in 1970-01-01 00:00:00 +0000
287+++ debian/libscope-harness.install.in 2015-09-18 13:58:53 +0000
288@@ -0,0 +1,1 @@
289+usr/lib/*/libscope-harness.so.*
290
291=== renamed file 'debian/libscope-harness1.symbols' => 'debian/libscope-harness.symbols.in'
292--- debian/libscope-harness1.symbols 2015-08-19 13:19:22 +0000
293+++ debian/libscope-harness.symbols.in 2015-09-18 13:58:53 +0000
294@@ -1,4 +1,4 @@
295-libscope-harness.so.1 libscope-harness1 #MINVER#
296+libscope-harness.so.@HARNESS_SO_VERSION@ libscope-harness@HARNESS_SO_VERSION@ #MINVER#
297 (c++)"typeinfo for unity::scopeharness::registry::CustomRegistry@Base" 0.5.4+15.04.20150311.3
298 (c++)"typeinfo for unity::scopeharness::registry::PreExistingRegistry@Base" 0.5.4+15.04.20150311.3
299 (c++)"typeinfo for unity::scopeharness::registry::Registry@Base" 0.5.4+15.04.20150311.3
300@@ -15,15 +15,15 @@
301 (c++|arch=!amd64 !arm64 !ppc64el)"unity::scopeharness::matcher::CategoryListMatcher::hasExactly(unsigned int)@Base" 0.5.4+15.04.20150311.3
302 (c++)"unity::scopeharness::matcher::CategoryListMatcher::match(std::vector<unity::scopeharness::results::Category, std::allocator<unity::scopeharness::results::Category> > const&) const@Base" 0.5.4+15.04.20150311.3
303 (c++)"unity::scopeharness::matcher::CategoryListMatcher::mode(unity::scopeharness::matcher::CategoryListMatcher::Mode)@Base" 0.5.4+15.04.20150311.3
304- (c++)"unity::scopeharness::matcher::CategoryMatcher::CategoryMatcher(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
305+ (c++)"unity::scopeharness::matcher::CategoryMatcher::CategoryMatcher(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
306 (c++)"unity::scopeharness::matcher::CategoryMatcher::CategoryMatcher(unity::scopeharness::matcher::CategoryMatcher&&)@Base" 0.5.4+15.04.20150311.3
307 (c++)"unity::scopeharness::matcher::CategoryMatcher::CategoryMatcher(unity::scopeharness::matcher::CategoryMatcher const&)@Base" 0.5.4+15.04.20150311.3
308 (c++)"unity::scopeharness::matcher::CategoryMatcher::components(unity::scopes::Variant const&)@Base" 0.5.4+15.04.20150311.3
309- (c++)"unity::scopeharness::matcher::CategoryMatcher::getId[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
310+ (c++)"unity::scopeharness::matcher::CategoryMatcher::getId() const@Base" 0.5.4+15.04.20150311.3
311 (c++|arch=amd64 arm64 ppc64el)"unity::scopeharness::matcher::CategoryMatcher::hasAtLeast(unsigned long)@Base" 0.5.4+15.04.20150311.3
312 (c++|arch=!amd64 !arm64 !ppc64el)"unity::scopeharness::matcher::CategoryMatcher::hasAtLeast(unsigned int)@Base" 0.5.4+15.04.20150311.3
313- (c++)"unity::scopeharness::matcher::CategoryMatcher::headerLink(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
314- (c++)"unity::scopeharness::matcher::CategoryMatcher::icon(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
315+ (c++)"unity::scopeharness::matcher::CategoryMatcher::headerLink(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
316+ (c++)"unity::scopeharness::matcher::CategoryMatcher::icon(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
317 (c++)"unity::scopeharness::matcher::CategoryMatcher::match(unity::scopeharness::matcher::MatchResult&, unity::scopeharness::results::Category const&) const@Base" 0.5.4+15.04.20150311.3
318 (c++)"unity::scopeharness::matcher::CategoryMatcher::match(unity::scopeharness::results::Category const&) const@Base" 0.5.4+15.04.20150311.3
319 (c++)"unity::scopeharness::matcher::CategoryMatcher::mode(unity::scopeharness::matcher::CategoryMatcher::Mode)@Base" 0.5.4+15.04.20150311.3
320@@ -32,20 +32,20 @@
321 (c++)"unity::scopeharness::matcher::CategoryMatcher::renderer(unity::scopes::Variant const&)@Base" 0.5.4+15.04.20150311.3
322 (c++)"unity::scopeharness::matcher::CategoryMatcher::result(unity::scopeharness::matcher::ResultMatcher&&)@Base" 0.5.4+15.04.20150311.3
323 (c++)"unity::scopeharness::matcher::CategoryMatcher::result(unity::scopeharness::matcher::ResultMatcher const&)@Base" 0.5.4+15.04.20150311.3
324- (c++)"unity::scopeharness::matcher::CategoryMatcher::title(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
325+ (c++)"unity::scopeharness::matcher::CategoryMatcher::title(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
326 (c++)"unity::scopeharness::matcher::ChildDepartmentMatcher::~ChildDepartmentMatcher()@Base" 0.5.4+15.04.20150311.3
327- (c++)"unity::scopeharness::matcher::ChildDepartmentMatcher::ChildDepartmentMatcher(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
328+ (c++)"unity::scopeharness::matcher::ChildDepartmentMatcher::ChildDepartmentMatcher(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
329 (c++)"unity::scopeharness::matcher::ChildDepartmentMatcher::ChildDepartmentMatcher(unity::scopeharness::matcher::ChildDepartmentMatcher&&)@Base" 0.5.4+15.04.20150311.3
330 (c++)"unity::scopeharness::matcher::ChildDepartmentMatcher::ChildDepartmentMatcher(unity::scopeharness::matcher::ChildDepartmentMatcher const&)@Base" 0.5.4+15.04.20150311.3
331- (c++)"unity::scopeharness::matcher::ChildDepartmentMatcher::getId[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
332+ (c++)"unity::scopeharness::matcher::ChildDepartmentMatcher::getId() const@Base" 0.5.4+15.04.20150311.3
333 (c++)"unity::scopeharness::matcher::ChildDepartmentMatcher::hasChildren(bool)@Base" 0.5.4+15.04.20150311.3
334 (c++)"unity::scopeharness::matcher::ChildDepartmentMatcher::isActive(bool)@Base" 0.5.4+15.04.20150311.3
335- (c++)"unity::scopeharness::matcher::ChildDepartmentMatcher::label(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
336+ (c++)"unity::scopeharness::matcher::ChildDepartmentMatcher::label(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
337 (c++)"unity::scopeharness::matcher::ChildDepartmentMatcher::match(unity::scopeharness::matcher::MatchResult&, unity::scopeharness::results::ChildDepartment const&) const@Base" 0.5.4+15.04.20150311.3
338 (c++)"unity::scopeharness::matcher::ChildDepartmentMatcher::match(unity::scopeharness::results::ChildDepartment const&) const@Base" 0.5.4+15.04.20150311.3
339 (c++)"unity::scopeharness::matcher::ChildDepartmentMatcher::operator=(unity::scopeharness::matcher::ChildDepartmentMatcher&&)@Base" 0.5.4+15.04.20150311.3
340 (c++)"unity::scopeharness::matcher::ChildDepartmentMatcher::operator=(unity::scopeharness::matcher::ChildDepartmentMatcher const&)@Base" 0.5.4+15.04.20150311.3
341- (c++)"unity::scopeharness::matcher::DepartmentMatcher::allLabel(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
342+ (c++)"unity::scopeharness::matcher::DepartmentMatcher::allLabel(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
343 (c++)"unity::scopeharness::matcher::DepartmentMatcher::child(unity::scopeharness::matcher::ChildDepartmentMatcher&&)@Base" 0.5.4+15.04.20150311.3
344 (c++)"unity::scopeharness::matcher::DepartmentMatcher::child(unity::scopeharness::matcher::ChildDepartmentMatcher const&)@Base" 0.5.4+15.04.20150311.3
345 (c++)"unity::scopeharness::matcher::DepartmentMatcher::~DepartmentMatcher()@Base" 0.5.4+15.04.20150311.3
346@@ -54,18 +54,18 @@
347 (c++|arch=!amd64 !arm64 !ppc64el)"unity::scopeharness::matcher::DepartmentMatcher::hasAtLeast(unsigned int)@Base" 0.5.4+15.04.20150311.3
348 (c++|arch=amd64 arm64 ppc64el)"unity::scopeharness::matcher::DepartmentMatcher::hasExactly(unsigned long)@Base" 0.5.4+15.04.20150311.3
349 (c++|arch=!amd64 !arm64 !ppc64el)"unity::scopeharness::matcher::DepartmentMatcher::hasExactly(unsigned int)@Base" 0.5.4+15.04.20150311.3
350- (c++)"unity::scopeharness::matcher::DepartmentMatcher::id(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
351+ (c++)"unity::scopeharness::matcher::DepartmentMatcher::id(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
352 (c++)"unity::scopeharness::matcher::DepartmentMatcher::isHidden(bool)@Base" 0.5.4+15.04.20150311.3
353 (c++)"unity::scopeharness::matcher::DepartmentMatcher::isRoot(bool)@Base" 0.5.4+15.04.20150311.3
354- (c++)"unity::scopeharness::matcher::DepartmentMatcher::label(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
355+ (c++)"unity::scopeharness::matcher::DepartmentMatcher::label(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
356 (c++)"unity::scopeharness::matcher::DepartmentMatcher::match(unity::scopeharness::matcher::MatchResult&, unity::scopeharness::results::Department const&) const@Base" 0.5.4+15.04.20150311.3
357 (c++)"unity::scopeharness::matcher::DepartmentMatcher::match(unity::scopeharness::results::Department const&) const@Base" 0.5.4+15.04.20150311.3
358 (c++)"unity::scopeharness::matcher::DepartmentMatcher::mode(unity::scopeharness::matcher::DepartmentMatcher::Mode)@Base" 0.5.4+15.04.20150311.3
359- (c++)"unity::scopeharness::matcher::DepartmentMatcher::parentId(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
360- (c++)"unity::scopeharness::matcher::DepartmentMatcher::parentLabel(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
361- (c++)"unity::scopeharness::matcher::MatchResult::concat_failures[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
362- (c++)"unity::scopeharness::matcher::MatchResult::failures[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
363- (c++)"unity::scopeharness::matcher::MatchResult::failure(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
364+ (c++)"unity::scopeharness::matcher::DepartmentMatcher::parentId(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
365+ (c++)"unity::scopeharness::matcher::DepartmentMatcher::parentLabel(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
366+ (c++)"unity::scopeharness::matcher::MatchResult::concat_failures() const@Base" 0.5.4+15.04.20150311.3
367+ (c++)"unity::scopeharness::matcher::MatchResult::failures() const@Base" 0.5.4+15.04.20150311.3
368+ (c++)"unity::scopeharness::matcher::MatchResult::failure(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
369 (c++)"unity::scopeharness::matcher::MatchResult::MatchResult()@Base" 0.5.4+15.04.20150311.3
370 (c++)"unity::scopeharness::matcher::MatchResult::MatchResult(unity::scopeharness::matcher::MatchResult&&)@Base" 0.5.4+15.04.20150311.3
371 (c++)"unity::scopeharness::matcher::MatchResult::MatchResult(unity::scopeharness::matcher::MatchResult const&)@Base" 0.5.4+15.04.20150311.3
372@@ -99,38 +99,38 @@
373 (c++)"unity::scopeharness::matcher::PreviewWidgetMatcher::operator=(unity::scopeharness::matcher::PreviewWidgetMatcher&&)@Base" 0.5.4+15.04.20150311.3
374 (c++)"unity::scopeharness::matcher::PreviewWidgetMatcher::operator=(unity::scopeharness::matcher::PreviewWidgetMatcher const&)@Base" 0.5.4+15.04.20150311.3
375 (c++)"unity::scopeharness::matcher::PreviewWidgetMatcher::~PreviewWidgetMatcher()@Base" 0.5.4+15.04.20150311.3
376- (c++)"unity::scopeharness::matcher::PreviewWidgetMatcher::PreviewWidgetMatcher(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
377+ (c++)"unity::scopeharness::matcher::PreviewWidgetMatcher::PreviewWidgetMatcher(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
378 (c++)"unity::scopeharness::matcher::PreviewWidgetMatcher::PreviewWidgetMatcher(unity::scopeharness::matcher::PreviewWidgetMatcher&&)@Base" 0.5.4+15.04.20150311.3
379 (c++)"unity::scopeharness::matcher::PreviewWidgetMatcher::PreviewWidgetMatcher(unity::scopeharness::matcher::PreviewWidgetMatcher const&)@Base" 0.5.4+15.04.20150311.3
380- (c++)"unity::scopeharness::matcher::PreviewWidgetMatcher::type(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
381+ (c++)"unity::scopeharness::matcher::PreviewWidgetMatcher::type(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
382 (c++)"unity::scopeharness::matcher::ResultMatcher::any_uri()@Base" 0.5.4+15.04.20150311.3
383- (c++)"unity::scopeharness::matcher::ResultMatcher::art(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
384+ (c++)"unity::scopeharness::matcher::ResultMatcher::art(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
385 (c++)"unity::scopeharness::matcher::ResultMatcher::attributes(unity::scopes::Variant const&)@Base" 0.5.4+15.04.20150311.3
386 (c++)"unity::scopeharness::matcher::ResultMatcher::background(unity::scopes::Variant const&)@Base" 0.5.4+15.04.20150311.3
387- (c++)"unity::scopeharness::matcher::ResultMatcher::dndUri(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
388- (c++)"unity::scopeharness::matcher::ResultMatcher::emblem(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
389- (c++)"unity::scopeharness::matcher::ResultMatcher::getUri[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
390- (c++)"unity::scopeharness::matcher::ResultMatcher::mascot(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
391+ (c++)"unity::scopeharness::matcher::ResultMatcher::dndUri(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
392+ (c++)"unity::scopeharness::matcher::ResultMatcher::emblem(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
393+ (c++)"unity::scopeharness::matcher::ResultMatcher::getUri() const@Base" 0.5.4+15.04.20150311.3
394+ (c++)"unity::scopeharness::matcher::ResultMatcher::mascot(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
395 (c++)"unity::scopeharness::matcher::ResultMatcher::match(unity::scopeharness::matcher::MatchResult&, unity::scopeharness::results::Result const&) const@Base" 0.5.4+15.04.20150311.3
396 (c++)"unity::scopeharness::matcher::ResultMatcher::match(unity::scopeharness::results::Result const&) const@Base" 0.5.4+15.04.20150311.3
397 (c++)"unity::scopeharness::matcher::ResultMatcher::operator=(unity::scopeharness::matcher::ResultMatcher&&)@Base" 0.5.4+15.04.20150311.3
398 (c++)"unity::scopeharness::matcher::ResultMatcher::operator=(unity::scopeharness::matcher::ResultMatcher const&)@Base" 0.5.4+15.04.20150311.3
399- (c++)"unity::scopeharness::matcher::ResultMatcher::property(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unity::scopes::Variant const&)@Base" 0.5.4+15.04.20150311.3
400- (c++)"unity::scopeharness::matcher::ResultMatcher::ResultMatcher(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
401+ (c++)"unity::scopeharness::matcher::ResultMatcher::property(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unity::scopes::Variant const&)@Base" 0.5.4+15.04.20150311.3
402+ (c++)"unity::scopeharness::matcher::ResultMatcher::ResultMatcher(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
403 (c++)"unity::scopeharness::matcher::ResultMatcher::ResultMatcher(unity::scopeharness::matcher::ResultMatcher const&)@Base" 0.5.4+15.04.20150311.3
404 (c++)"unity::scopeharness::matcher::ResultMatcher::ResultMatcher(unity::scopeharness::matcher::ScopeUri const&)@Base" 0.5.4+15.04.20150311.3
405- (c++)"unity::scopeharness::matcher::ResultMatcher::subtitle(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
406+ (c++)"unity::scopeharness::matcher::ResultMatcher::subtitle(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
407 (c++)"unity::scopeharness::matcher::ResultMatcher::summary(unity::scopes::Variant const&)@Base" 0.5.4+15.04.20150311.3
408- (c++)"unity::scopeharness::matcher::ResultMatcher::title(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
409- (c++)"unity::scopeharness::matcher::ScopeUri::department(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
410+ (c++)"unity::scopeharness::matcher::ResultMatcher::title(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
411+ (c++)"unity::scopeharness::matcher::ScopeUri::department(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
412 (c++)"unity::scopeharness::matcher::ScopeUri::operator=(unity::scopeharness::matcher::ScopeUri&&)@Base" 0.5.4+15.04.20150311.3
413 (c++)"unity::scopeharness::matcher::ScopeUri::operator=(unity::scopeharness::matcher::ScopeUri const&)@Base" 0.5.4+15.04.20150311.3
414- (c++)"unity::scopeharness::matcher::ScopeUri::query(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
415+ (c++)"unity::scopeharness::matcher::ScopeUri::query(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
416 (c++)"unity::scopeharness::matcher::ScopeUri::~ScopeUri()@Base" 0.5.4+15.04.20150311.3
417- (c++)"unity::scopeharness::matcher::ScopeUri::ScopeUri(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
418+ (c++)"unity::scopeharness::matcher::ScopeUri::ScopeUri(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
419 (c++)"unity::scopeharness::matcher::ScopeUri::ScopeUri(unity::scopeharness::matcher::ScopeUri&&)@Base" 0.5.4+15.04.20150311.3
420 (c++)"unity::scopeharness::matcher::ScopeUri::ScopeUri(unity::scopeharness::matcher::ScopeUri const&)@Base" 0.5.4+15.04.20150311.3
421- (c++)"unity::scopeharness::matcher::ScopeUri::toString[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
422+ (c++)"unity::scopeharness::matcher::ScopeUri::toString() const@Base" 0.5.4+15.04.20150311.3
423 (c++|arch=amd64 arm64 ppc64el)"unity::scopeharness::matcher::SettingsMatcher::hasAtLeast(unsigned long)@Base" 0.5.4+15.10.20150601
424 (c++|arch=!amd64 !arm64 !ppc64el)"unity::scopeharness::matcher::SettingsMatcher::hasAtLeast(unsigned int)@Base" 0.5.4+15.10.20150601
425 (c++|arch=amd64 arm64 ppc64el)"unity::scopeharness::matcher::SettingsMatcher::hasExactly(unsigned long)@Base" 0.5.4+15.10.20150601
426@@ -140,21 +140,21 @@
427 (c++)"unity::scopeharness::matcher::SettingsMatcher::option(unity::scopeharness::matcher::SettingsOptionMatcher const&)@Base" 0.5.4+15.10.20150601
428 (c++)"unity::scopeharness::matcher::SettingsMatcher::SettingsMatcher()@Base" 0.5.4+15.10.20150601
429 (c++)"unity::scopeharness::matcher::SettingsOptionMatcher::defaultValue(unity::scopes::Variant const&)@Base" 0.5.4+15.10.20150601
430- (c++)"unity::scopeharness::matcher::SettingsOptionMatcher::displayName(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.10.20150601
431+ (c++)"unity::scopeharness::matcher::SettingsOptionMatcher::displayName(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.10.20150601
432 (c++)"unity::scopeharness::matcher::SettingsOptionMatcher::displayValues(std::vector<unity::scopes::Variant, std::allocator<unity::scopes::Variant> > const&)@Base" 0.5.4+15.10.20150601
433- (c++)"unity::scopeharness::matcher::SettingsOptionMatcher::getId[abi:cxx11]() const@Base" 0.5.4+15.10.20150601
434+ (c++)"unity::scopeharness::matcher::SettingsOptionMatcher::getId() const@Base" 0.5.4+15.10.20150601
435 (c++)"unity::scopeharness::matcher::SettingsOptionMatcher::match(unity::scopeharness::matcher::MatchResult&, unity::scopeharness::view::SettingsView::Option const&) const@Base" 0.5.4+15.10.20150601
436 (c++)"unity::scopeharness::matcher::SettingsOptionMatcher::operator=(unity::scopeharness::matcher::SettingsOptionMatcher const&)@Base" 0.5.4+15.10.20150601
437 (c++)"unity::scopeharness::matcher::SettingsOptionMatcher::optionType(unity::scopeharness::view::SettingsView::OptionType)@Base" 0.5.4+15.10.20150601
438- (c++)"unity::scopeharness::matcher::SettingsOptionMatcher::SettingsOptionMatcher(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.10.20150601
439+ (c++)"unity::scopeharness::matcher::SettingsOptionMatcher::SettingsOptionMatcher(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.10.20150601
440 (c++)"unity::scopeharness::matcher::SettingsOptionMatcher::SettingsOptionMatcher(unity::scopeharness::matcher::SettingsOptionMatcher const&)@Base" 0.5.4+15.10.20150601
441 (c++)"unity::scopeharness::matcher::SettingsOptionMatcher::value(unity::scopes::Variant const&)@Base" 0.5.4+15.10.20150601
442 (c++)"unity::scopeharness::preview::PreviewWidget::data() const@Base" 0.5.4+15.04.20150311.3
443- (c++)"unity::scopeharness::preview::PreviewWidget::id[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
444- (c++)"unity::scopeharness::preview::PreviewWidgetList::at(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.5.4+15.04.20150311.3
445+ (c++)"unity::scopeharness::preview::PreviewWidget::id() const@Base" 0.5.4+15.04.20150311.3
446+ (c++)"unity::scopeharness::preview::PreviewWidgetList::at(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.5.4+15.04.20150311.3
447 (c++|arch=amd64 arm64 ppc64el)"unity::scopeharness::preview::PreviewWidgetList::at(unsigned long) const@Base" 0.5.4+15.04.20150311.3
448 (c++|arch=!amd64 !arm64 !ppc64el)"unity::scopeharness::preview::PreviewWidgetList::at(unsigned int) const@Base" 0.5.4+15.04.20150311.3
449- (c++)"unity::scopeharness::preview::PreviewWidgetList::operator[](std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.5.4+15.04.20150311.3
450+ (c++)"unity::scopeharness::preview::PreviewWidgetList::operator[](std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.5.4+15.04.20150311.3
451 (c++)"unity::scopeharness::preview::PreviewWidgetList::operator=(unity::scopeharness::preview::PreviewWidgetList&&)@Base" 0.5.4+15.04.20150311.3
452 (c++)"unity::scopeharness::preview::PreviewWidgetList::operator=(unity::scopeharness::preview::PreviewWidgetList const&)@Base" 0.5.4+15.04.20150311.3
453 (c++|arch=amd64 arm64 ppc64el)"unity::scopeharness::preview::PreviewWidgetList::operator[](unsigned long) const@Base" 0.5.4+15.04.20150311.3
454@@ -170,8 +170,8 @@
455 (c++)"unity::scopeharness::preview::PreviewWidget::PreviewWidget(unity::scopeharness::internal::PreviewWidgetArguments const&)@Base" 0.5.4+15.04.20150311.3
456 (c++)"unity::scopeharness::preview::PreviewWidget::PreviewWidget(unity::scopeharness::preview::PreviewWidget&&)@Base" 0.5.4+15.04.20150311.3
457 (c++)"unity::scopeharness::preview::PreviewWidget::PreviewWidget(unity::scopeharness::preview::PreviewWidget const&)@Base" 0.5.4+15.04.20150311.3
458- (c++)"unity::scopeharness::preview::PreviewWidget::trigger(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unity::scopes::Variant const&)@Base" 0.5.4+15.04.20150311.3
459- (c++)"unity::scopeharness::preview::PreviewWidget::type[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
460+ (c++)"unity::scopeharness::preview::PreviewWidget::trigger(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unity::scopes::Variant const&)@Base" 0.5.4+15.04.20150311.3
461+ (c++)"unity::scopeharness::preview::PreviewWidget::type() const@Base" 0.5.4+15.04.20150311.3
462 (c++)"unity::scopeharness::registry::CustomRegistry::~CustomRegistry()@Base" 0.5.4+15.04.20150311.3
463 (c++)"unity::scopeharness::registry::CustomRegistry::CustomRegistry(unity::scopeharness::registry::CustomRegistry::Parameters const&)@Base" 0.5.4+15.04.20150311.3
464 (c++)"unity::scopeharness::registry::CustomRegistry::Parameters::includeClickScopes()@Base" 0.5.4+15.04.20150311.3
465@@ -180,12 +180,12 @@
466 (c++)"unity::scopeharness::registry::CustomRegistry::Parameters::includeSystemScopes()@Base" 0.5.4+15.04.20150311.3
467 (c++)"unity::scopeharness::registry::CustomRegistry::Parameters::operator=(unity::scopeharness::registry::CustomRegistry::Parameters&&)@Base" 0.5.4+15.04.20150311.3
468 (c++)"unity::scopeharness::registry::CustomRegistry::Parameters::operator=(unity::scopeharness::registry::CustomRegistry::Parameters const&)@Base" 0.5.4+15.04.20150311.3
469- (c++)"unity::scopeharness::registry::CustomRegistry::Parameters::Parameters(std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&)@Base" 0.5.4+15.04.20150311.3
470+ (c++)"unity::scopeharness::registry::CustomRegistry::Parameters::Parameters(std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&)@Base" 0.5.4+15.04.20150311.3
471 (c++)"unity::scopeharness::registry::CustomRegistry::Parameters::Parameters(unity::scopeharness::registry::CustomRegistry::Parameters&&)@Base" 0.5.4+15.04.20150311.3
472 (c++)"unity::scopeharness::registry::CustomRegistry::Parameters::Parameters(unity::scopeharness::registry::CustomRegistry::Parameters const&)@Base" 0.5.4+15.04.20150311.3
473 (c++)"unity::scopeharness::registry::CustomRegistry::start()@Base" 0.5.4+15.04.20150311.3
474 (c++)"unity::scopeharness::registry::PreExistingRegistry::~PreExistingRegistry()@Base" 0.5.4+15.04.20150311.3
475- (c++)"unity::scopeharness::registry::PreExistingRegistry::PreExistingRegistry(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
476+ (c++)"unity::scopeharness::registry::PreExistingRegistry::PreExistingRegistry(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
477 (c++)"unity::scopeharness::registry::PreExistingRegistry::start()@Base" 0.5.4+15.04.20150311.3
478 (c++)"unity::scopeharness::registry::SystemRegistry::start()@Base" 0.5.4+15.04.20150311.3
479 (c++)"unity::scopeharness::registry::SystemRegistry::~SystemRegistry()@Base" 0.5.4+15.04.20150311.3
480@@ -195,29 +195,29 @@
481 (c++)"unity::scopeharness::results::Category::Category(unity::scopeharness::results::Category const&)@Base" 0.5.4+15.04.20150311.3
482 (c++)"unity::scopeharness::results::Category::components() const@Base" 0.5.4+15.04.20150311.3
483 (c++)"unity::scopeharness::results::Category::empty() const@Base" 0.5.4+15.04.20150311.3
484- (c++)"unity::scopeharness::results::Category::headerLink[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
485- (c++)"unity::scopeharness::results::Category::icon[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
486- (c++)"unity::scopeharness::results::Category::id[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
487+ (c++)"unity::scopeharness::results::Category::headerLink() const@Base" 0.5.4+15.04.20150311.3
488+ (c++)"unity::scopeharness::results::Category::icon() const@Base" 0.5.4+15.04.20150311.3
489+ (c++)"unity::scopeharness::results::Category::id() const@Base" 0.5.4+15.04.20150311.3
490 (c++)"unity::scopeharness::results::Category::operator=(unity::scopeharness::results::Category&&)@Base" 0.5.4+15.04.20150311.3
491 (c++)"unity::scopeharness::results::Category::operator=(unity::scopeharness::results::Category const&)@Base" 0.5.4+15.04.20150311.3
492 (c++)"unity::scopeharness::results::Category::renderer() const@Base" 0.5.4+15.04.20150311.3
493 (c++)"unity::scopeharness::results::Category::results() const@Base" 0.5.4+15.04.20150311.3
494- (c++)"unity::scopeharness::results::Category::result(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.5.4+15.04.20150311.3
495+ (c++)"unity::scopeharness::results::Category::result(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.5.4+15.04.20150311.3
496 (c++|arch=amd64 arm64 ppc64el)"unity::scopeharness::results::Category::result(unsigned long) const@Base" 0.5.4+15.04.20150311.3
497 (c++|arch=!amd64 !arm64 !ppc64el)"unity::scopeharness::results::Category::result(unsigned int) const@Base" 0.5.4+15.04.20150311.3
498 (c++)"unity::scopeharness::results::Category::size() const@Base" 0.5.4+15.04.20150311.3
499- (c++)"unity::scopeharness::results::Category::title[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
500+ (c++)"unity::scopeharness::results::Category::title() const@Base" 0.5.4+15.04.20150311.3
501 (c++)"unity::scopeharness::results::ChildDepartment::~ChildDepartment()@Base" 0.5.4+15.04.20150311.3
502 (c++)"unity::scopeharness::results::ChildDepartment::ChildDepartment(unity::scopeharness::internal::ChildDepartmentArguments const&)@Base" 0.5.4+15.04.20150311.3
503 (c++)"unity::scopeharness::results::ChildDepartment::ChildDepartment(unity::scopeharness::results::ChildDepartment&&)@Base" 0.5.4+15.04.20150311.3
504 (c++)"unity::scopeharness::results::ChildDepartment::ChildDepartment(unity::scopeharness::results::ChildDepartment const&)@Base" 0.5.4+15.04.20150311.3
505 (c++)"unity::scopeharness::results::ChildDepartment::hasChildren() const@Base" 0.5.4+15.04.20150311.3
506- (c++)"unity::scopeharness::results::ChildDepartment::id[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
507+ (c++)"unity::scopeharness::results::ChildDepartment::id() const@Base" 0.5.4+15.04.20150311.3
508 (c++)"unity::scopeharness::results::ChildDepartment::isActive() const@Base" 0.5.4+15.04.20150311.3
509- (c++)"unity::scopeharness::results::ChildDepartment::label[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
510+ (c++)"unity::scopeharness::results::ChildDepartment::label() const@Base" 0.5.4+15.04.20150311.3
511 (c++)"unity::scopeharness::results::ChildDepartment::operator=(unity::scopeharness::results::ChildDepartment&&)@Base" 0.5.4+15.04.20150311.3
512 (c++)"unity::scopeharness::results::ChildDepartment::operator=(unity::scopeharness::results::ChildDepartment const&)@Base" 0.5.4+15.04.20150311.3
513- (c++)"unity::scopeharness::results::Department::allLabel[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
514+ (c++)"unity::scopeharness::results::Department::allLabel() const@Base" 0.5.4+15.04.20150311.3
515 (c++)"unity::scopeharness::results::Department::children() const@Base" 0.5.4+15.04.20150311.3
516 (c++|arch=amd64 arm64 ppc64el)"unity::scopeharness::results::Department::child(unsigned long) const@Base" 0.5.4+15.04.20150311.3
517 (c++|arch=!amd64 !arm64 !ppc64el)"unity::scopeharness::results::Department::child(unsigned int) const@Base" 0.5.4+15.04.20150311.3
518@@ -225,36 +225,36 @@
519 (c++)"unity::scopeharness::results::Department::Department(unity::scopeharness::internal::DepartmentArguments const&)@Base" 0.5.4+15.04.20150311.3
520 (c++)"unity::scopeharness::results::Department::Department(unity::scopeharness::results::Department&&)@Base" 0.5.4+15.04.20150311.3
521 (c++)"unity::scopeharness::results::Department::Department(unity::scopeharness::results::Department const&)@Base" 0.5.4+15.04.20150311.3
522- (c++)"unity::scopeharness::results::Department::id[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
523+ (c++)"unity::scopeharness::results::Department::id() const@Base" 0.5.4+15.04.20150311.3
524 (c++)"unity::scopeharness::results::Department::isHidden() const@Base" 0.5.4+15.04.20150311.3
525 (c++)"unity::scopeharness::results::Department::isRoot() const@Base" 0.5.4+15.04.20150311.3
526- (c++)"unity::scopeharness::results::Department::label[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
527+ (c++)"unity::scopeharness::results::Department::label() const@Base" 0.5.4+15.04.20150311.3
528 (c++)"unity::scopeharness::results::Department::loaded() const@Base" 0.5.4+15.04.20150311.3
529 (c++)"unity::scopeharness::results::Department::operator=(unity::scopeharness::results::Department&&)@Base" 0.5.4+15.04.20150311.3
530 (c++)"unity::scopeharness::results::Department::operator=(unity::scopeharness::results::Department const&)@Base" 0.5.4+15.04.20150311.3
531- (c++)"unity::scopeharness::results::Department::parentId[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
532- (c++)"unity::scopeharness::results::Department::parentLabel[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
533+ (c++)"unity::scopeharness::results::Department::parentId() const@Base" 0.5.4+15.04.20150311.3
534+ (c++)"unity::scopeharness::results::Department::parentLabel() const@Base" 0.5.4+15.04.20150311.3
535 (c++)"unity::scopeharness::results::Department::size() const@Base" 0.5.4+15.04.20150311.3
536- (c++)"unity::scopeharness::results::Result::art[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
537+ (c++)"unity::scopeharness::results::Result::art() const@Base" 0.5.4+15.04.20150311.3
538 (c++)"unity::scopeharness::results::Result::attributes() const@Base" 0.5.4+15.04.20150311.3
539 (c++)"unity::scopeharness::results::Result::background() const@Base" 0.5.4+15.04.20150311.3
540- (c++)"unity::scopeharness::results::Result::dnd_uri[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
541- (c++)"unity::scopeharness::results::Result::emblem[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
542+ (c++)"unity::scopeharness::results::Result::dnd_uri() const@Base" 0.5.4+15.04.20150311.3
543+ (c++)"unity::scopeharness::results::Result::emblem() const@Base" 0.5.4+15.04.20150311.3
544 (c++)"unity::scopeharness::results::Result::longPress() const@Base" 0.5.4+15.04.20150311.3
545- (c++)"unity::scopeharness::results::Result::mascot[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
546- (c++)"unity::scopeharness::results::Result::operator[](std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.5.4+15.04.20150311.3
547+ (c++)"unity::scopeharness::results::Result::mascot() const@Base" 0.5.4+15.04.20150311.3
548+ (c++)"unity::scopeharness::results::Result::operator[](std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.5.4+15.04.20150311.3
549 (c++)"unity::scopeharness::results::Result::operator=(unity::scopeharness::results::Result&&)@Base" 0.5.4+15.04.20150311.3
550 (c++)"unity::scopeharness::results::Result::operator=(unity::scopeharness::results::Result const&)@Base" 0.5.4+15.04.20150311.3
551 (c++)"unity::scopeharness::results::Result::Result(unity::scopeharness::internal::ResultArguments const&)@Base" 0.5.4+15.04.20150311.3
552 (c++)"unity::scopeharness::results::Result::Result(unity::scopeharness::results::Result&&)@Base" 0.5.4+15.04.20150311.3
553 (c++)"unity::scopeharness::results::Result::Result(unity::scopeharness::results::Result const&)@Base" 0.5.4+15.04.20150311.3
554- (c++)"unity::scopeharness::results::Result::subtitle[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
555+ (c++)"unity::scopeharness::results::Result::subtitle() const@Base" 0.5.4+15.04.20150311.3
556 (c++)"unity::scopeharness::results::Result::summary() const@Base" 0.5.4+15.04.20150311.3
557 (c++)"unity::scopeharness::results::Result::tap() const@Base" 0.5.4+15.04.20150311.3
558- (c++)"unity::scopeharness::results::Result::title[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
559- (c++)"unity::scopeharness::results::Result::uri[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
560- (c++)"unity::scopeharness::results::Result::value(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.5.4+15.04.20150311.3
561- (c++)"unity::scopeharness::ScopeHarness::newFromPreExistingConfig(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
562+ (c++)"unity::scopeharness::results::Result::title() const@Base" 0.5.4+15.04.20150311.3
563+ (c++)"unity::scopeharness::results::Result::uri() const@Base" 0.5.4+15.04.20150311.3
564+ (c++)"unity::scopeharness::results::Result::value(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.5.4+15.04.20150311.3
565+ (c++)"unity::scopeharness::ScopeHarness::newFromPreExistingConfig(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
566 (c++)"unity::scopeharness::ScopeHarness::newFromScopeList(unity::scopeharness::registry::CustomRegistry::Parameters const&)@Base" 0.5.4+15.04.20150311.3
567 (c++)"unity::scopeharness::ScopeHarness::newFromSystem()@Base" 0.5.4+15.04.20150311.3
568 (c++)"unity::scopeharness::ScopeHarness::resultsView()@Base" 0.5.4+15.04.20150311.3
569@@ -266,8 +266,8 @@
570 (c++)"unity::scopeharness::TestUtils::previewForFirstResult(QSharedPointer<scopes_ng::Scope>, QString const&, QScopedPointer<scopes_ng::PreviewStack, QScopedPointerDeleter<scopes_ng::PreviewStack> >&)@Base" 0.5.4+15.04.20150311.3
571 (c++)"unity::scopeharness::TestUtils::refreshSearch(QSharedPointer<scopes_ng::Scope>)@Base" 0.5.4+15.04.20150311.3
572 (c++)"unity::scopeharness::TestUtils::setFavouriteScopes(QStringList const&)@Base" 0.5.4+15.04.20150311.3
573- (c++)"unity::scopeharness::TestUtils::throwIf(bool, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
574- (c++)"unity::scopeharness::TestUtils::throwIfNot(bool, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
575+ (c++)"unity::scopeharness::TestUtils::throwIf(bool, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
576+ (c++)"unity::scopeharness::TestUtils::throwIfNot(bool, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
577 (c++)"unity::scopeharness::TestUtils::waitForResultsChange(QSharedPointer<unity::shell::scopes::ScopeInterface>)@Base" 0.5.4+15.04.20150311.3
578 (c++)"unity::scopeharness::TestUtils::waitForSearchFinish(QSharedPointer<unity::shell::scopes::ScopeInterface>)@Base" 0.5.4+15.04.20150311.3
579 (c++)"unity::scopeharness::view::AbstractView::~AbstractView()@Base" 0.5.4+15.04.20150311.3
580@@ -282,45 +282,46 @@
581 (c++|arch=amd64 arm64 ppc64el)"unity::scopeharness::view::PreviewView::widgetsInColumn(unsigned long)@Base" 0.5.4+15.04.20150311.3
582 (c++|arch=!amd64 !arm64 !ppc64el)"unity::scopeharness::view::PreviewView::widgetsInColumn(unsigned int)@Base" 0.5.4+15.04.20150311.3
583 (c++)"unity::scopeharness::view::PreviewView::widgetsInFirstColumn()@Base" 0.5.4+15.04.20150311.3
584- (c++)"unity::scopeharness::view::ResultsView::activeScope[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
585- (c++)"unity::scopeharness::view::ResultsView::altDepartmentId[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
586- (c++)"unity::scopeharness::view::ResultsView::browseAltDepartment(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
587- (c++)"unity::scopeharness::view::ResultsView::browseDepartment(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
588+ (c++)"unity::scopeharness::view::ResultsView::activeScope() const@Base" 0.5.4+15.04.20150311.3
589+ (c++)"unity::scopeharness::view::ResultsView::altDepartmentId() const@Base" 0.5.4+15.04.20150311.3
590+ (c++)"unity::scopeharness::view::ResultsView::browseAltDepartment(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
591+ (c++)"unity::scopeharness::view::ResultsView::browseDepartment(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
592 (c++)"unity::scopeharness::view::ResultsView::categories()@Base" 0.5.4+15.04.20150311.3
593- (c++)"unity::scopeharness::view::ResultsView::category(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
594+ (c++)"unity::scopeharness::view::ResultsView::category(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
595 (c++|arch=amd64 arm64 ppc64el)"unity::scopeharness::view::ResultsView::category(unsigned long)@Base" 0.5.4+15.04.20150311.3
596 (c++|arch=!amd64 !arm64 !ppc64el)"unity::scopeharness::view::ResultsView::category(unsigned int)@Base" 0.5.4+15.04.20150311.3
597 (c++)"unity::scopeharness::view::ResultsView::customizations() const@Base" 0.5.4+15.04.20150311.3
598- (c++)"unity::scopeharness::view::ResultsView::departmentId[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
599- (c++)"unity::scopeharness::view::ResultsView::description[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
600- (c++)"unity::scopeharness::view::ResultsView::displayName[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
601+ (c++)"unity::scopeharness::view::ResultsView::departmentId() const@Base" 0.5.4+15.04.20150311.3
602+ (c++)"unity::scopeharness::view::ResultsView::description() const@Base" 0.5.4+15.04.20150311.3
603+ (c++)"unity::scopeharness::view::ResultsView::displayName() const@Base" 0.5.4+15.04.20150311.3
604 (c++)"unity::scopeharness::view::ResultsView::forceRefresh()@Base" 0.5.4+15.04.20150311.3
605 (c++)"unity::scopeharness::view::ResultsView::hasAltDepartments() const@Base" 0.5.4+15.04.20150311.3
606 (c++)"unity::scopeharness::view::ResultsView::hasDepartments() const@Base" 0.5.4+15.04.20150311.3
607- (c++)"unity::scopeharness::view::ResultsView::iconHint[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
608- (c++)"unity::scopeharness::view::ResultsView::overrideCategoryJson(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
609- (c++)"unity::scopeharness::view::ResultsView::query[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
610+ (c++)"unity::scopeharness::view::ResultsView::iconHint() const@Base" 0.5.4+15.04.20150311.3
611+ (c++)"unity::scopeharness::view::ResultsView::overrideCategoryJson(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.5.4+15.04.20150311.3
612+ (c++)"unity::scopeharness::view::ResultsView::query() const@Base" 0.5.4+15.04.20150311.3
613 (c++)"unity::scopeharness::view::ResultsView::queryId() const@Base" 0.5.4+15.04.20150311.3
614 (c++)"unity::scopeharness::view::ResultsView::~ResultsView()@Base" 0.5.4+15.04.20150311.3
615 (c++)"unity::scopeharness::view::ResultsView::ResultsView(unity::scopeharness::internal::ResultsViewArguments const&)@Base" 0.5.4+15.04.20150311.3
616- (c++)"unity::scopeharness::view::ResultsView::scopeId[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
617- (c++)"unity::scopeharness::view::ResultsView::searchHint[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
618- (c++)"unity::scopeharness::view::ResultsView::sessionId[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
619- (c++)"unity::scopeharness::view::ResultsView::setActiveScope(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
620+ (c++)"unity::scopeharness::view::ResultsView::scopeId() const@Base" 0.5.4+15.04.20150311.3
621+ (c++)"unity::scopeharness::view::ResultsView::searchHint() const@Base" 0.5.4+15.04.20150311.3
622+ (c++)"unity::scopeharness::view::ResultsView::sessionId() const@Base" 0.5.4+15.04.20150311.3
623+ (c++)"unity::scopeharness::view::ResultsView::setActiveScope(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
624 (c++)"unity::scopeharness::view::ResultsView::setPreviewView(std::shared_ptr<unity::scopeharness::view::PreviewView>)@Base" 0.5.4+15.04.20150311.3
625- (c++)"unity::scopeharness::view::ResultsView::setQuery(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
626+ (c++)"unity::scopeharness::view::ResultsView::setQuery(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
627 (c++)"unity::scopeharness::view::ResultsView::settings() const@Base" 0.5.4+15.10.20150601
628- (c++)"unity::scopeharness::view::ResultsView::shortcut[abi:cxx11]() const@Base" 0.5.4+15.04.20150311.3
629+ (c++)"unity::scopeharness::view::ResultsView::shortcut() const@Base" 0.5.4+15.04.20150311.3
630 (c++)"unity::scopeharness::view::ResultsView::status() const@Base" 0.5.4+15.04.20150311.3
631 (c++)"unity::scopeharness::view::ResultsView::waitForResultsChange()@Base" 0.5.4+15.04.20150311.3
632 (c++)"unity::scopeharness::view::SettingsView::count() const@Base" 0.5.4+15.10.20150601
633 (c++)"unity::scopeharness::view::SettingsView::Option::~Option()@Base" 0.5.4+15.10.20150601
634 (c++)"unity::scopeharness::view::SettingsView::options() const@Base" 0.5.4+15.10.20150601
635- (c++)"unity::scopeharness::view::SettingsView::set(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unity::scopes::Variant const&)@Base" 0.5.4+15.10.20150601
636+ (c++)"unity::scopeharness::view::SettingsView::set(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unity::scopes::Variant const&)@Base" 0.5.4+15.10.20150601
637 (c++)"unity::scopeharness::view::SettingsView::~SettingsView()@Base" 0.5.4+15.10.20150601
638 (c++)"unity::scopeharness::view::SettingsView::SettingsView(unity::scopeharness::internal::SettingsViewArguments const&)@Base" 0.5.4+15.10.20150601
639 (c++)"vtable for unity::scopeharness::registry::CustomRegistry@Base" 0.5.4+15.04.20150311.3
640 (c++)"vtable for unity::scopeharness::registry::PreExistingRegistry@Base" 0.5.4+15.04.20150311.3
641+ (c++)"vtable for unity::scopeharness::registry::Registry@Base" 0.5.4+15.04.20150311.3
642 (c++)"vtable for unity::scopeharness::registry::SystemRegistry@Base" 0.5.4+15.04.20150311.3
643 (c++)"vtable for unity::scopeharness::view::AbstractView@Base" 0.5.4+15.04.20150311.3
644 (c++)"vtable for unity::scopeharness::view::PreviewView@Base" 0.5.4+15.04.20150311.3
645
646=== modified file 'debian/rules'
647--- debian/rules 2015-01-21 12:35:02 +0000
648+++ debian/rules 2015-09-18 13:58:53 +0000
649@@ -20,3 +20,7 @@
650
651 override_dh_auto_configure:
652 dh_auto_configure -- -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
653+
654+override_dh_auto_clean:
655+ /bin/sh $(CURDIR)/debian/gen-debian-files.sh
656+ dh_auto_clean
657
658=== added file 'debian/shlibs.in'
659--- debian/shlibs.in 1970-01-01 00:00:00 +0000
660+++ debian/shlibs.in 2015-09-18 13:58:53 +0000
661@@ -0,0 +1,1 @@
662+libscope-harness @HARNESS_SO_VERSION@ libscope-harness@HARNESS_SO_VERSION@ (>= @HARNESS_MAJORMINOR@)
663
664=== modified file 'src/Unity/scope.cpp'
665--- src/Unity/scope.cpp 2015-08-26 09:00:16 +0000
666+++ src/Unity/scope.cpp 2015-09-18 13:58:53 +0000
667@@ -276,7 +276,6 @@
668 }
669 if (previewedResult != nullptr && *result == *previewedResult) {
670 stack->update(widgets);
671- break;
672 }
673 }
674 }
675
676=== modified file 'src/scope-harness/CMakeLists.txt'
677--- src/scope-harness/CMakeLists.txt 2015-05-14 14:13:56 +0000
678+++ src/scope-harness/CMakeLists.txt 2015-09-18 13:58:53 +0000
679@@ -1,7 +1,3 @@
680-
681-set(API_VERSION 1)
682-set(ABI_VERSION 1)
683-
684 set(SYMBOL_MAP "${CMAKE_SOURCE_DIR}/data/libscope-harness.map")
685
686 _pkgconfig_invoke(libunity-scopes SCOPESLIB SCOPERUNNER_BIN "" --variable=scoperunner_bin )
687@@ -14,7 +10,7 @@
688 ${GSETTINGSQT_INCLUDE_DIRS}
689 ${Boost_INCLUDE_DIRS}
690 )
691-
692+
693 add_definitions(
694 -DSCOPESLIB_SCOPERUNNER_BIN="${SCOPESLIB_SCOPERUNNER_BIN}"
695 -DSCOPESLIB_SCOPEREGISTRY_BIN="${SCOPESLIB_SCOPEREGISTRY_BIN}"
696@@ -70,8 +66,8 @@
697 set_target_properties(
698 scope-harness
699 PROPERTIES
700- VERSION ${API_VERSION}.0.0
701- SOVERSION ${ABI_VERSION}
702+ VERSION ${HARNESS_FULL_VERSION}
703+ SOVERSION ${HARNESS_SO_VERSION}
704 LINK_FLAGS "-Wl,--version-script,${SYMBOL_MAP}"
705 LINK_DEPENDS "${SYMBOL_MAP}"
706 )

Subscribers

People subscribed via source and target branches

to all changes: