address-book-service

Merge lp:~jbicha/address-book-service/evolution324 into lp:address-book-service

  1. evolution324
  2. Merge into trunk
Proposed by Jeremy Bícha
Status: Merged
Approved by: Jeremy Bícha
Approved revision: 233
Merged at revision: 231
Proposed branch: lp:~jbicha/address-book-service/evolution324
Merge into: lp:address-book-service
Diff against target: 89 lines (+19/-5)
6 files modified
3rd_party/folks/dummy/backend/dummy-backend-factory.vala (+1/-1)
3rd_party/folks/dummy/lib/dummy-backend.vala (+1/-1)
3rd_party/folks/dummy/lib/dummy-persona-store.vala (+1/-1)
CMakeLists.txt (+5/-1)
debian/changelog (+11/-0)
debian/control (+0/-1)
To merge this branch: bzr merge lp:~jbicha/address-book-service/evolution324
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+325677@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '3rd_party/folks/dummy/backend/dummy-backend-factory.vala'
2--- 3rd_party/folks/dummy/backend/dummy-backend-factory.vala 2014-03-05 17:48:27 +0000
3+++ 3rd_party/folks/dummy/backend/dummy-backend-factory.vala 2017-06-14 16:42:24 +0000
4@@ -65,7 +65,7 @@
5 dummy_persona_store.persona_type = typeof (FolksDummy.FullPersona);
6
7 /* Register it with the backend. */
8- var persona_stores = new HashSet<PersonaStore> ();
9+ var persona_stores = new HashSet<FolksDummy.PersonaStore> ();
10 persona_stores.add (dummy_persona_store);
11
12 var backend = new FolksDummy.Backend ();
13
14=== modified file '3rd_party/folks/dummy/lib/dummy-backend.vala'
15--- 3rd_party/folks/dummy/lib/dummy-backend.vala 2014-06-25 19:58:58 +0000
16+++ 3rd_party/folks/dummy/lib/dummy-backend.vala 2017-06-14 16:42:24 +0000
17@@ -138,7 +138,7 @@
18 *
19 * @since UNRELEASED
20 */
21- public override Map<string, PersonaStore> persona_stores
22+ public override Map<string, Folks.PersonaStore> persona_stores
23 {
24 get { return this._enabled_persona_stores_ro; }
25 }
26
27=== modified file '3rd_party/folks/dummy/lib/dummy-persona-store.vala'
28--- 3rd_party/folks/dummy/lib/dummy-persona-store.vala 2013-12-13 14:24:51 +0000
29+++ 3rd_party/folks/dummy/lib/dummy-persona-store.vala 2017-06-14 16:42:24 +0000
30@@ -225,7 +225,7 @@
31 *
32 * @since UNRELEASED
33 */
34- public override Map<string, Persona> personas
35+ public override Map<string, Folks.Persona> personas
36 {
37 get { return this._personas_ro; }
38 }
39
40=== modified file 'CMakeLists.txt'
41--- CMakeLists.txt 2015-09-23 12:36:13 +0000
42+++ CMakeLists.txt 2017-06-14 16:42:24 +0000
43@@ -37,10 +37,14 @@
44 set(EVOLUTION_API_3_17 "0")
45 set(EVOLUTION_ADDRESSBOOK_SERVICE_NAME "org.gnome.evolution.dataserver.AddressBook6")
46 set(EVOLUTION_SOURCE_SERVICE_NAME "org.gnome.evolution.dataserver.Sources3")
47-else()
48+elseif(EDATASERVER_VERSION VERSION_LESS "3.24")
49 set(EVOLUTION_API_3_17 "1")
50 set(EVOLUTION_ADDRESSBOOK_SERVICE_NAME "org.gnome.evolution.dataserver.AddressBook9")
51 set(EVOLUTION_SOURCE_SERVICE_NAME "org.gnome.evolution.dataserver.Sources4")
52+else()
53+ set(EVOLUTION_API_3_17 "1")
54+ set(EVOLUTION_ADDRESSBOOK_SERVICE_NAME "org.gnome.evolution.dataserver.AddressBook9")
55+ set(EVOLUTION_SOURCE_SERVICE_NAME "org.gnome.evolution.dataserver.Sources5")
56 endif()
57
58 set(CMAKE_INCLUDE_CURRENT_DIR ON)
59
60=== modified file 'debian/changelog'
61--- debian/changelog 2016-11-24 18:54:55 +0000
62+++ debian/changelog 2017-06-14 16:42:24 +0000
63@@ -1,3 +1,14 @@
64+address-book-service (0.1.2+17.04.20161124.2-0ubuntu1) UNRELEASED; urgency=medium
65+
66+ [ Rico Tzschichholz ]
67+ * Fix build with vala 0.36
68+
69+ [ Jeremy Bicha ]
70+ * Don't build-depend on evolution-data-server-online-accounts
71+ * Update evolution D-Bus address for evolution-data-server 3.24
72+
73+ -- Rico Tzschichholz <ricotz@ubuntu.com> Wed, 14 Jun 2017 12:35:13 -0400
74+
75 address-book-service (0.1.2+17.04.20161124.1-0ubuntu1) zesty; urgency=medium
76
77 [ Michael Terry ]
78
79=== modified file 'debian/control'
80--- debian/control 2016-09-20 14:28:27 +0000
81+++ debian/control 2017-06-14 16:42:24 +0000
82@@ -6,7 +6,6 @@
83 dbus-test-runner,
84 debhelper (>= 9),
85 dh-translations,
86- evolution-data-server-online-accounts,
87 gobject-introspection (>= 1.31.0-2~),
88 libaccounts-glib-dev,
89 libaccounts-qt5-dev,

Subscribers

People subscribed via source and target branches