Merge into trunk : no-sync-dep : Code : address-book-service

Status:

Merged

Approved by:

Ken VanDine on 2016-09-20

Approved revision:

223

Merged at revision:

220

Proposed branch:

lp:~renatofilho/address-book-service/no-sync-dep

Merge into:

lp:address-book-service

Diff against target:

127 lines (+13/-18)

6 files modified

debian/control (+3/-8)
debian/evolution-data-server-utouch-dev.install (+1/-1)
eds-extension/CMakeLists.txt (+1/-1)
lib/addressbook.cpp (+1/-1)
lib/detail-context-parser.cpp (+1/-1)
lib/view-adaptor.h (+6/-6)

To merge this branch:

bzr merge lp:~renatofilho/address-book-service/no-sync-dep

Related bugs:

Bug #1625172: [MIR] address-book-service	Undecided	Fix Released
Bug #1625642: Fix lintian warnings	Undecided	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Ken VanDine		2016-09-19	Approve on 2016-09-20
system-apps-ci-bot	continuous-integration		Approve on 2016-09-20
Review via email: mp+306090@code.launchpad.net

Commit Message

Remove 'address-book-updater' as install dep.
Make it as 'suggests' dep.
Fix lintian warnings.

lp:~renatofilho/address-book-service/no-sync-dep updated on 2016-09-19

221. By Renato Araujo Oliveira Filho on 2016-09-19: Use 'Suggests' instead.

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-09-19:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-service-ci/11/rebuild

review: Approve (continuous-integration)

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-09-19:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-service-ci/12/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/address-book-service/no-sync-dep updated on 2016-09-20

222. By Ken VanDine on 2016-09-20: Fix lintian warnings.
223. By Renato Araujo Oliveira Filho on 2016-09-20: Does not use "Multi-Arch: same" for utouch EDs plugin.

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-09-20:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-service-ci/13/rebuild

review: Approve (continuous-integration)

Ken VanDine (ken-vandine) wrote on 2016-09-20:

#

Looks good

review: Approve

1	=== modified file 'debian/control'
2	--- debian/control 2016-07-20 15:01:13 +0000
3	+++ debian/control 2016-09-20 14:28:42 +0000
4	@@ -33,14 +33,14 @@
5	Package: address-book-service
6	Architecture: any
7	Multi-Arch: same
8	-Depends: address-book-updater (= ${binary:Version}),
9	- evolution-data-server-utouch (= ${binary:Version}),
10	+Depends: evolution-data-server-utouch (= ${binary:Version}),
11	evolution-data-server(>= 3.12.11),
12	libfolks-eds25,
13	${misc:Depends},
14	${shlibs:Depends},
15	+Suggests: address-book-updater (= ${binary:Version}),
16	Description: Ubuntu contact service
17	- A contact aggregator service, that exports all contact information through dbus.
18	+ A contact aggregator service, that exports all contact information through D-Bus.
19
20	Package: address-book-service-dummy
21	Architecture: any
22	@@ -85,7 +85,6 @@
23	address-book-service (<< 0.1.2)
24	Breaks: address-book-service (<< 0.1.2)
25	Architecture: any
26	-Multi-Arch: same
27	Depends: ${misc:Depends},
28	${shlibs:Depends},
29	Description: EDS extension used by Ubuntu Touch apps
30	@@ -96,7 +95,6 @@
31	Replaces: evolution-data-server-ubuntu-dev
32	Breaks: evolution-data-server-ubuntu-dev
33	Architecture: any
34	-Multi-Arch: same
35	Depends: evolution-data-server-utouch (= ${binary:Version}),
36	${misc:Depends},
37	${shlibs:Depends},
38	@@ -106,6 +104,3 @@
39	.
40	This package contains header files for evolution-data-server-ubuntu.
41
42	-
43	-
44	-
45
46	=== modified file 'debian/evolution-data-server-utouch-dev.install'
47	--- debian/evolution-data-server-utouch-dev.install 2016-07-20 15:01:13 +0000
48	+++ debian/evolution-data-server-utouch-dev.install 2016-09-20 14:28:42 +0000
49	@@ -1,2 +1,2 @@
50	usr/include/evolution-data-server-ubuntu/e-source-ubuntu.h
51	-usr/share/pkgconfig/evolution-data-server-ubuntu.pc
52	+usr/lib/*/pkgconfig/evolution-data-server-ubuntu.pc
53
54	=== modified file 'eds-extension/CMakeLists.txt'
55	--- eds-extension/CMakeLists.txt 2016-06-03 17:00:40 +0000
56	+++ eds-extension/CMakeLists.txt 2016-09-20 14:28:42 +0000
57	@@ -41,7 +41,7 @@
58	DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/evolution-data-server-ubuntu
59	)
60	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${UBUNTU_SOURCE_PC_FILE}
61	- DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/pkgconfig/
62	+ DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig/
63	)
64
65	# Module Ubuntu Sources
66
67	=== modified file 'lib/addressbook.cpp'
68	--- lib/addressbook.cpp 2015-12-11 16:44:21 +0000
69	+++ lib/addressbook.cpp 2016-09-20 14:28:42 +0000
70	@@ -1104,7 +1104,7 @@
71	GError *gError = NULL;
72	ESourceRegistry *registry = e_source_registry_new_sync (NULL, &gError);
73	if (gError) {
74	- qWarning() << "Fail to find EDS default souce";
75	+ qWarning() << "Fail to find EDS default source";
76	} else {
77	ESource *defaultAB = e_source_registry_ref_default_address_book(registry);
78	if (defaultAB) {
79
80	=== modified file 'lib/detail-context-parser.cpp'
81	--- lib/detail-context-parser.cpp 2015-09-24 20:14:14 +0000
82	+++ lib/detail-context-parser.cpp 2016-09-20 14:28:42 +0000
83	@@ -223,7 +223,7 @@
84	continue;
85	} else if (QString::fromUtf8(parameter) != "type") {
86	if (!whiteList.contains(QString::fromUtf8(parameter))) {
87	- qDebug() << "not suported field details" << parameter;
88	+ qDebug() << "not supported field details" << parameter;
89	// FIXME: check what to do with other parameters
90	}
91	continue;
92
93	=== modified file 'lib/view-adaptor.h'
94	--- lib/view-adaptor.h 2014-06-11 20:06:40 +0000
95	+++ lib/view-adaptor.h 2016-09-20 14:28:42 +0000
96	@@ -40,15 +40,15 @@
97	" <property name=\"count\" type=\"i\" access=\"read\"/>\n"
98	" <signal name=\"contactsUpdated\">\n"
99	" <arg direction=\"out\" type=\"i\" name=\"pos\"/>\n"
100	-" <arg direction=\"out\" type=\"i\" name=\"lenght\"/>\n"
101	+" <arg direction=\"out\" type=\"i\" name=\"length\"/>\n"
102	" </signal>\n"
103	" <signal name=\"contactsRemoved\">\n"
104	" <arg direction=\"out\" type=\"i\" name=\"pos\"/>\n"
105	-" <arg direction=\"out\" type=\"i\" name=\"lenght\"/>\n"
106	+" <arg direction=\"out\" type=\"i\" name=\"length\"/>\n"
107	" </signal>\n"
108	" <signal name=\"contactsAdded\">\n"
109	" <arg direction=\"out\" type=\"i\" name=\"pos\"/>\n"
110	-" <arg direction=\"out\" type=\"i\" name=\"lenght\"/>\n"
111	+" <arg direction=\"out\" type=\"i\" name=\"length\"/>\n"
112	" </signal>\n"
113	" <method name=\"sort\">\n"
114	" <arg direction=\"in\" type=\"s\" name=\"field\"/>\n"
115	@@ -81,9 +81,9 @@
116	void close();
117
118	Q_SIGNALS:
119	- void contactsAdded(int pos, int lenght);
120	- void contactsRemoved(int pos, int lenght);
121	- void contactsUpdated(int pos, int lenght);
122	+ void contactsAdded(int pos, int length);
123	+ void contactsRemoved(int pos, int length);
124	+ void contactsUpdated(int pos, int length);
125	void countChanged(int count);
126
127	private:

address-book-service

Merge lp:~renatofilho/address-book-service/no-sync-dep into lp:address-book-service

Commit Message

Description of the Change

Preview Diff

Subscribers