gmenuharness

Merge lp:~xavi-garcia-mena/gmenuharness/update-changelog into lp:gmenuharness

  1. update-changelog
  2. Merge into trunk
Proposed by Xavi Garcia
Status: Merged
Approved by: Xavi Garcia
Approved revision: 17
Merged at revision: 17
Proposed branch: lp:~xavi-garcia-mena/gmenuharness/update-changelog
Merge into: lp:gmenuharness
Diff against target: 59 lines (+8/-5)
5 files modified
.bzr-builddeb/default.conf (+2/-0)
debian/changelog (+3/-2)
debian/libgmenuharness0.1.symbols (+1/-1)
include/unity/gmenuharness/MenuItemMatcher.h (+1/-1)
src/MenuItemMatcher.cpp (+1/-1)
To merge this branch: bzr merge lp:~xavi-garcia-mena/gmenuharness/update-changelog
Reviewer Review Type Date Requested Status
Xavi Garcia Approve
Review via email: mp+277441@code.launchpad.net

Commit message

Updated changelog to reflect the real date.

Description of the change

Updated changelog to reflect the real date.

To post a comment you must log in.
Revision history for this message
Xavi Garcia (xavi-garcia-mena) :
review: Approve
lp:~xavi-garcia-mena/gmenuharness/update-changelog updated
18. By Xavi Garcia

Added .bzr-builddeb folder

19. By Xavi Garcia

changed size_t to unsingned int as some architectures fail to build due to symbols mismatch

20. By Xavi Garcia

Dual landing modifactions to manage gcc5.X ABI break

21. By Xavi Garcia

Added lsb_release to build-depends

22. By Xavi Garcia

Back to revision 19

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== added file '.bzr-builddeb/default.conf'
3--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
4+++ .bzr-builddeb/default.conf 2015-11-17 11:47:25 +0000
5@@ -0,0 +1,2 @@
6+[BUILDDEB]
7+split = True
8
9=== modified file 'debian/changelog'
10--- debian/changelog 2015-08-05 11:03:59 +0000
11+++ debian/changelog 2015-11-17 11:47:25 +0000
12@@ -1,5 +1,6 @@
13-libgmenuharness (0.1) UNRELEASED; urgency=medium
14+libgmenuharness (0.1ubuntu1) UNRELEASED; urgency=medium
15
16+ [ Xavi Garcia ]
17 * Initial release.
18
19- -- Xavi Garcia <xavi.garcia.mena@canonical.com> Wed, 05 Aug 2015 12:19:51 +0200
20+ -- Xavi Garcia <xavi.garcia.mena@canonical.com> Fri, 13 Nov 2015 13:17:33 +0100
21
22=== modified file 'debian/libgmenuharness0.1.symbols'
23--- debian/libgmenuharness0.1.symbols 2015-10-28 16:23:43 +0000
24+++ debian/libgmenuharness0.1.symbols 2015-11-17 11:47:25 +0000
25@@ -19,7 +19,7 @@
26 (c++)"unity::gmenuharness::MenuItemMatcher::boolean_attribute(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0replaceme
27 (c++)"unity::gmenuharness::MenuItemMatcher::checkbox()@Base" 0replaceme
28 (c++)"unity::gmenuharness::MenuItemMatcher::double_attribute(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, double)@Base" 0replaceme
29- (c++)"unity::gmenuharness::MenuItemMatcher::has_exactly(unsigned long)@Base" 0replaceme
30+ (c++)"unity::gmenuharness::MenuItemMatcher::has_exactly(unsigned int)@Base" 0replaceme
31 (c++)"unity::gmenuharness::MenuItemMatcher::icon(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
32 (c++)"unity::gmenuharness::MenuItemMatcher::int32_attribute(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int)@Base" 0replaceme
33 (c++)"unity::gmenuharness::MenuItemMatcher::int64_attribute(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int)@Base" 0replaceme
34
35=== modified file 'include/unity/gmenuharness/MenuItemMatcher.h'
36--- include/unity/gmenuharness/MenuItemMatcher.h 2015-10-28 14:12:34 +0000
37+++ include/unity/gmenuharness/MenuItemMatcher.h 2015-11-17 11:47:25 +0000
38@@ -113,7 +113,7 @@
39
40 MenuItemMatcher& is_empty();
41
42- MenuItemMatcher& has_exactly(std::size_t children);
43+ MenuItemMatcher& has_exactly(unsigned int children);
44
45 MenuItemMatcher& item(const MenuItemMatcher& item);
46
47
48=== modified file 'src/MenuItemMatcher.cpp'
49--- src/MenuItemMatcher.cpp 2015-10-28 15:56:50 +0000
50+++ src/MenuItemMatcher.cpp 2015-11-17 11:47:25 +0000
51@@ -420,7 +420,7 @@
52 return has_exactly(0);
53 }
54
55-MenuItemMatcher& MenuItemMatcher::has_exactly(size_t children)
56+MenuItemMatcher& MenuItemMatcher::has_exactly(unsigned int children)
57 {
58 p->m_expectedSize = make_shared<size_t>(children);
59 return *this;

Subscribers

People subscribed via source and target branches