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

[Charles Kerr]

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

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

[dobey (dobey)]

Looks ok.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:431
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/351/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-armhf-ci/41
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-armhf-ci/41/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/351/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-01-29 18:53:43 +0000
+++ CMakeLists.txt	2016-02-02 20:13:28 +0000
@@ -42,7 +42,7 @@
                    glib-2.0>=2.36
                    gio-unix-2.0>=2.36
                    libical>=0.48
-                   libecal-1.2>=3.16
+                   libecal-1.2>=3.5
                    libedataserver-1.2>=3.5
                    gstreamer-1.0>=1.2
                    libnotify>=0.7.6

=== modified file 'debian/control'
--- debian/control	2015-10-14 03:32:03 +0000
+++ debian/control	2016-02-02 20:13:28 +0000
@@ -9,7 +9,7 @@
                libglib2.0-dev (>= 2.35.4),
                libnotify-dev (>= 0.7.6),
                libgstreamer1.0-dev,
-               libecal1.2-dev (>= 3.16),
+               libecal1.2-dev (>= 3.5),
                libical-dev (>= 1.0),
                libedataserver1.2-dev (>= 3.5),
                liburl-dispatcher1-dev,

=== modified file 'src/engine-eds.cpp'
--- src/engine-eds.cpp	2015-07-22 12:00:11 +0000
+++ src/engine-eds.cpp	2016-02-02 20:13:28 +0000
@@ -276,7 +276,9 @@
             g_debug("%s connecting a client to source %s", G_STRFUNC, source_uid);
             e_cal_client_connect(source,
                                  source_type,
+#if EDS_CHECK_VERSION(3,13,90)
                                  -1,
+#endif
                                  self->m_cancellable.get(),
                                  on_client_connected,
                                  gself);