Indicator Date and Time

Merge lp:~charlesk/indicator-datetime/unified-eds-code into lp:indicator-datetime/15.10

  1. unified-eds-code
  2. Merge into trunk.15.10
Proposed by Charles Kerr on 2016-02-02
Status: Merged
Approved by: dobey on 2016-02-02
Approved revision: 431
Merged at revision: 431
Proposed branch: lp:~charlesk/indicator-datetime/unified-eds-code
Merge into: lp:indicator-datetime/15.10
Diff against target: 39 lines (+4/-2)
3 files modified
CMakeLists.txt (+1/-1)
debian/control (+1/-1)
src/engine-eds.cpp (+2/-0)
To merge this branch: bzr merge lp:~charlesk/indicator-datetime/unified-eds-code
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2016-02-02
dobey (community) 2016-02-02 Approve on 2016-02-02
Review via email: mp+284789@code.launchpad.net

Commit Message

change packaging dependencies and add source #ifdefs to support the versions of EDS that ship with vivid and xenial

Description of the Change

change packaging dependencies and add source #ifdefs to support the versions of EDS that ship with vivid and xenial

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 'CMakeLists.txt'
2--- CMakeLists.txt 2016-01-29 18:53:43 +0000
3+++ CMakeLists.txt 2016-02-02 20:13:28 +0000
4@@ -42,7 +42,7 @@
5 glib-2.0>=2.36
6 gio-unix-2.0>=2.36
7 libical>=0.48
8- libecal-1.2>=3.16
9+ libecal-1.2>=3.5
10 libedataserver-1.2>=3.5
11 gstreamer-1.0>=1.2
12 libnotify>=0.7.6
13
14=== modified file 'debian/control'
15--- debian/control 2015-10-14 03:32:03 +0000
16+++ debian/control 2016-02-02 20:13:28 +0000
17@@ -9,7 +9,7 @@
18 libglib2.0-dev (>= 2.35.4),
19 libnotify-dev (>= 0.7.6),
20 libgstreamer1.0-dev,
21- libecal1.2-dev (>= 3.16),
22+ libecal1.2-dev (>= 3.5),
23 libical-dev (>= 1.0),
24 libedataserver1.2-dev (>= 3.5),
25 liburl-dispatcher1-dev,
26
27=== modified file 'src/engine-eds.cpp'
28--- src/engine-eds.cpp 2015-07-22 12:00:11 +0000
29+++ src/engine-eds.cpp 2016-02-02 20:13:28 +0000
30@@ -276,7 +276,9 @@
31 g_debug("%s connecting a client to source %s", G_STRFUNC, source_uid);
32 e_cal_client_connect(source,
33 source_type,
34+#if EDS_CHECK_VERSION(3,13,90)
35 -1,
36+#endif
37 self->m_cancellable.get(),
38 on_client_connected,
39 gself);

Subscribers

People subscribed via source and target branches