Merge lp:~robert-ancell/indicator-datetime/libecal-3.16 into lp:indicator-datetime/15.10

[Robert Ancell]

When wily updates to evolution-data-server 3.16 there is a small API change required.

[Robert Ancell (robert-ancell)]

Updated is tracked in bug 1460271.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:412
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/319/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-amd64-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-armhf-ci/9/console

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

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

Robert Ancell, patch LGTM, what is the timeline for landing libecal-3.16?

Feel free to silo this together with the ecal upgrade.

review: Approve

[Robert Ancell (robert-ancell)]

We don't have a timeline currently. Currently tracking down all the build-dependencies so we can do the migration. If no side-effects I would expect to land 3.16 as soon as we have resolved those.

[Iain Lane (laney)]

Been blatting bits into ppa:ci-train-ppa-service/landing-028

Testing that silo, I don't see any appointments in i-datetime any more. Running it with G_MESSAGES_DEBUG=all shows

laney@raleigh> pkill -f indicator-datetime-service; G_MESSAGES_DEBUG=all /usr/lib/x86_64-linux-gnu/indicator-datetime/indicator-datetime-service ~
(process:12781): Indicator-Datetime-DEBUG: /build/buildd/indicator-datetime-13.10.0+15.10.20150515/src/timezone-file.cpp:90 Monitoring timezone file '/etc/timezone'
(process:12781): Indicator-Datetime-DEBUG: /build/buildd/indicator-datetime-13.10.0+15.10.20150515/src/timezone-file.cpp:90 Monitoring timezone file '/etc/timezone'
(process:12781): Indicator-Datetime-DEBUG: PlannerMonth 0x1f3d5a0 setting calendar month range: [2015-06-01 00:00:00..2015-06-30 23:59:59]
(process:12781): Indicator-Datetime-DEBUG: rebuilding because the date range changed
(process:12781): Indicator-Datetime-DEBUG: 0x1f3e1c0 setting date range to [2015-06-17 00:00:00..2015-07-17 00:00:00]
(process:12781): Indicator-Datetime-DEBUG: rebuilding because the date range changed
(process:12781): Indicator-Datetime-DEBUG: 0x1f45010 setting date range to [2015-06-17 00:00:00..2015-07-17 00:00:00]
(process:12781): Indicator-Datetime-DEBUG: rebuilding because the date range changed
(process:12781): Indicator-Datetime-DEBUG: planner has 0 appointments in it
(process:12781): Indicator-Datetime-DEBUG: /build/buildd/indicator-datetime-13.10.0+15.10.20150515/src/formatter.cpp:104 guint unity::indicator::datetime::{anonymous}::calculate_seconds_until_next_fifteen_minutes(GDateTime*) the next timestamp rebuild will be at 2015-06-18 17:15:00
(process:12781): Indicator-Datetime-DEBUG: /build/buildd/indicator-datetime-13.10.0+15.10.20150515/src/formatter.cpp:104 guint unity::indicator::datetime::{anonymous}::calculate_seconds_until_next_fifteen_minutes(GDateTime*) the next timestamp rebuild will be at 2015-06-18 17:15:00
(process:12781): Indicator-Datetime-DEBUG: /build/buildd/indicator-datetime-13.10.0+15.10.20150515/src/formatter.cpp:104 guint unity::indicator::datetime::{anonymous}::calculate_seconds_until_next_fifteen_minutes(GDateTime*) the next timestamp rebuild will be at 2015-06-18 17:15:00
(process:12781): Indicator-Datetime-DEBUG: /build/buildd/indicator-datetime-13.10.0+15.10.20150515/src/formatter.cpp:104 guint unity::indicator::datetime::{anonymous}::calculate_seconds_until_next_fifteen_minutes(GDateTime*) the next timestamp rebuild will be at 2015-06-18 17:15:00
(process:12781): Indicator-Datetime-DEBUG: bus acquired: com.canonical.indicator.datetime
(process:12781): Indicator-Datetime-DEBUG: from geoclue, setting timezone to 'Europe/London'
(process:12781): Indicator-Datetime-DEBUG: getting all appointments from [2015-06-01 00:00:00 ... 2015-06-30 23:59:59]
(process:12781): Indicator-Datetime-DEBUG: default_timezone is 0x1f6db78
(process:12781): Indicator-Datetime-DEBUG: RangePlanner 0x1f3cda0 got 0 appointments
(process:12781): Indicator-Datetime-DEBUG: time to delete task 0x1f6add0
(process:12781): Indicator-Datetime-DEBUG: gett...

[Iain Lane (laney)]

OK, never mind, I'm an idiot who forgot to upload it. :)

Do have an extra commit to fix the tests though - want to pull lp:~laney/indicator-datetime/eds316-fix-tests into here?

[lp:~robert-ancell/indicator-datetime/libecal-3.16]

413. By Robert Ancell on 2015-06-18

Fix tests

[Iain Lane (laney)]

I have proposed https://code.launchpad.net/~laney/indicator-datetime/eds-3.16/+merge/265287 which supersedes this (they refactored the tests a bit in trunk, it's otherwise the same)

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-19 04:03:38 +0000
+++ CMakeLists.txt	2015-06-18 21:40:28 +0000
@@ -36,7 +36,7 @@
                    glib-2.0>=2.36
                    gio-unix-2.0>=2.36
                    libical>=0.48
-                   libecal-1.2>=3.5
+                   libecal-1.2>=3.16
                    libedataserver-1.2>=3.5
                    gstreamer-1.0>=1.2
                    libnotify>=0.7.6

=== modified file 'debian/control'
--- debian/control	2015-04-06 14:25:59 +0000
+++ debian/control	2015-06-18 21:40:28 +0000
@@ -9,7 +9,7 @@
                libglib2.0-dev (>= 2.35.4),
                libnotify-dev (>= 0.7.6),
                libgstreamer1.0-dev,
-               libecal1.2-dev (>= 3.5),
+               libecal1.2-dev (>= 3.16),
                libical-dev (>= 1.0),
                libedataserver1.2-dev (>= 3.5),
                liburl-dispatcher1-dev,

=== modified file 'src/engine-eds.cpp'
--- src/engine-eds.cpp	2015-04-06 19:58:34 +0000
+++ src/engine-eds.cpp	2015-06-18 21:40:28 +0000
@@ -263,6 +263,7 @@
             g_debug("%s connecting a client to source %s", G_STRFUNC, source_uid);
             e_cal_client_connect(source,
                                  source_type,
+                                 -1,
                                  self->m_cancellable,
                                  on_client_connected,
                                  gself);

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-04-06 00:19:01 +0000
+++ tests/CMakeLists.txt	2015-06-18 21:40:28 +0000
@@ -75,7 +75,7 @@
 find_program(GVFSD gvfsd PATHS /usr/lib/gvfs/)
 OPTION(EVOLUTION_SOURCE_SERVICE_NAME "DBus name for source registry")
 if(NOT EVOLUTION_SOURCE_SERVICE_NAME)
-    set(EVOLUTION_SOURCE_SERVICE_NAME "org.gnome.evolution.dataserver.Sources3")
+    set(EVOLUTION_SOURCE_SERVICE_NAME "org.gnome.evolution.dataserver.Sources4")
 endif()
 
 function(add_eds_test_by_name name)

=== modified file 'tests/run-eds-test.sh'
--- tests/run-eds-test.sh	2015-04-06 20:09:16 +0000
+++ tests/run-eds-test.sh	2015-06-18 21:40:28 +0000
@@ -43,7 +43,7 @@
 
 # run dbus-test-runner
 $1 --keep-env --max-wait=90 \
---task $2 --task-name $3 --wait-until-complete --wait-for=org.gnome.evolution.dataserver.Calendar4 \
+--task $2 --task-name $3 --wait-until-complete --wait-for=org.gnome.evolution.dataserver.Calendar7 \
 --task $4 --task-name "evolution" --wait-until-complete -r
 #--task $6 --task-name "source-registry" --wait-for=org.gtk.vfs.Daemon -r \
 #--task $7 --task-name "gvfsd" -r