diff -u history-service-0.1+15.04.20150210/debian/changelog history-service-0.1+15.04.20150210/debian/changelog
--- history-service-0.1+15.04.20150210/debian/changelog
+++ history-service-0.1+15.04.20150210/debian/changelog
@@ -1,3 +1,9 @@
+history-service (0.1+15.04.20150210-0ubuntu2) vivid; urgency=medium
+
+  * Build with telepathy-qt 0.9.6~
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 17 Feb 2015 17:38:21 +0100
+
 history-service (0.1+15.04.20150210-0ubuntu1) vivid; urgency=medium
 
   [ Tiago Salem Herrmann ]
diff -u history-service-0.1+15.04.20150210/debian/control history-service-0.1+15.04.20150210/debian/control
--- history-service-0.1+15.04.20150210/debian/control
+++ history-service-0.1+15.04.20150210/debian/control
@@ -10,7 +10,7 @@
                gnome-keyring,
                libqt5sql5-sqlite,
                libsqlite3-dev,
-               libtelepathy-qt5-dev,
+               libtelepathy-qt5-dev (>= 0.9.6~),
                pkg-config,
                python,
                qt5-default,
only in patch2:
unchanged:
--- history-service-0.1+15.04.20150210.orig/plugins/sqlite/schema/schema.sql
+++ history-service-0.1+15.04.20150210/plugins/sqlite/schema/schema.sql
@@ -0,0 +1,197 @@
+CREATE TABLE schema_version (
+    version int
+);
+CREATE TABLE threads (
+    accountId varchar(255),
+    threadId varchar(255),
+    type tinyint,
+    lastEventId varchar(255),
+    lastEventTimestamp datetime,
+    count int,
+    unreadCount int
+);
+CREATE TABLE thread_participants (
+    accountId varchar(255),
+    threadId varchar(255),
+    type tinyint,
+    participantId varchar(255)
+);
+CREATE TABLE voice_events (
+    accountId varchar(255),
+    threadId varchar(255),
+    eventId varchar(255),
+    senderId varchar(255),
+    timestamp datetime,
+    newEvent bool,
+    duration int,
+    missed bool
+, remoteParticipant varchar(255));
+CREATE TABLE text_event_attachments (
+    accountId varchar(255),
+    threadId varchar(255),
+    eventId varchar(255),
+    attachmentId varchar(255),
+    contentType varchar(255),
+    filePath varchar(255),
+    status tinyint
+);
+CREATE TRIGGER threads_delete_trigger  AFTER DELETE ON threads
+FOR EACH ROW
+BEGIN
+    DELETE FROM thread_participants WHERE
+        accountId=old.accountId AND
+        threadId=old.threadId AND
+        type=old.type;
+END;
+CREATE TABLE text_events (
+    accountId varchar(255),
+    threadId varchar(255),
+    eventId varchar(255),
+    senderId varchar(255),
+    timestamp datetime,
+    newEvent bool,
+    message varchar(512),
+    messageType tinyint,
+    messageStatus tinyint,
+    readTimestamp datetime,
+    subject varchar(256)
+);
+CREATE TRIGGER voice_events_insert_trigger  AFTER INSERT ON voice_events
+FOR EACH ROW
+BEGIN
+    UPDATE threads SET count=(SELECT count(eventId) FROM voice_events WHERE
+        accountId=new.accountId AND
+        threadId=new.threadId)
+        WHERE accountId=new.accountId AND threadId=new.threadId AND type=1;
+    UPDATE threads SET unreadCount=(SELECT count(eventId) FROM voice_events WHERE
+        accountId=new.accountId AND threadId=new.threadId AND newEvent='1')
+        WHERE accountId=new.accountId AND threadId=new.threadId AND type=1;
+    UPDATE threads SET lastEventId=(SELECT eventId FROM voice_events WHERE
+        accountId=new.accountId AND
+        threadId=new.threadId
+        ORDER BY timestamp DESC LIMIT 1)
+        WHERE accountId=new.accountId AND threadId=new.threadId AND type=1;
+    UPDATE threads SET lastEventTimestamp=(SELECT timestamp FROM voice_events WHERE
+        accountId=new.accountId AND
+        threadId=new.threadId
+        ORDER BY timestamp DESC LIMIT 1)
+        WHERE accountId=new.accountId AND threadId=new.threadId AND type=1;
+END;
+CREATE TRIGGER voice_events_update_trigger  AFTER UPDATE ON voice_events
+FOR EACH ROW
+BEGIN
+    UPDATE threads SET count=(SELECT count(eventId) FROM voice_events WHERE
+        accountId=new.accountId AND
+        threadId=new.threadId)
+        WHERE accountId=new.accountId AND threadId=new.threadId AND type=1;
+    UPDATE threads SET unreadCount=(SELECT count(eventId) FROM voice_events WHERE
+        accountId=new.accountId AND threadId=new.threadId AND newEvent='1')
+        WHERE accountId=new.accountId AND threadId=new.threadId AND type=1;
+    UPDATE threads SET lastEventId=(SELECT eventId FROM voice_events WHERE
+        accountId=new.accountId AND
+        threadId=new.threadId
+        ORDER BY timestamp DESC LIMIT 1)
+        WHERE accountId=new.accountId AND threadId=new.threadId AND type=1;
+    UPDATE threads SET lastEventTimestamp=(SELECT timestamp FROM voice_events WHERE
+        accountId=new.accountId AND
+        threadId=new.threadId
+        ORDER BY timestamp DESC LIMIT 1)
+        WHERE accountId=new.accountId AND threadId=new.threadId AND type=1;
+END;
+CREATE TRIGGER voice_events_delete_trigger  AFTER DELETE ON voice_events
+FOR EACH ROW
+BEGIN
+    UPDATE threads SET count=(SELECT count(eventId) FROM voice_events WHERE
+        accountId=old.accountId AND
+        threadId=old.threadId)
+        WHERE accountId=old.accountId AND threadId=old.threadId AND type=1;
+    UPDATE threads SET unreadCount=(SELECT count(eventId) FROM voice_events WHERE
+        accountId=old.accountId AND threadId=old.threadId AND newEvent='1')
+        WHERE accountId=old.accountId AND threadId=old.threadId AND type=1;
+    UPDATE threads SET lastEventId=(SELECT eventId FROM voice_events WHERE
+        accountId=old.accountId AND
+        threadId=old.threadId
+        ORDER BY timestamp DESC LIMIT 1)
+        WHERE accountId=old.accountId AND threadId=old.threadId AND type=1;
+    UPDATE threads SET lastEventTimestamp=(SELECT timestamp FROM voice_events WHERE
+        accountId=old.accountId AND
+        threadId=old.threadId
+        ORDER BY timestamp DESC LIMIT 1)
+        WHERE accountId=old.accountId AND threadId=old.threadId AND type=1;
+END;
+CREATE TRIGGER text_events_insert_trigger  AFTER INSERT ON text_events
+FOR EACH ROW
+BEGIN
+    UPDATE threads SET count=(SELECT count(eventId) FROM text_events WHERE
+        accountId=new.accountId AND
+        threadId=new.threadId AND
+        messageType!=2)
+        WHERE accountId=new.accountId AND threadId=new.threadId AND type=0;
+    UPDATE threads SET unreadCount=(SELECT count(eventId) FROM text_events WHERE
+        accountId=new.accountId AND threadId=new.threadId AND newEvent='1' AND messageType!=2)
+        WHERE accountId=new.accountId AND threadId=new.threadId AND type=0;
+    UPDATE threads SET lastEventId=(SELECT eventId FROM text_events WHERE
+        accountId=new.accountId AND
+        threadId=new.threadId AND
+        messageType!=2
+        ORDER BY timestamp DESC LIMIT 1)
+        WHERE accountId=new.accountId AND threadId=new.threadId AND type=0;
+    UPDATE threads SET lastEventTimestamp=(SELECT timestamp FROM text_events WHERE
+        accountId=new.accountId AND
+        threadId=new.threadId AND
+        messageType!=2
+        ORDER BY timestamp DESC LIMIT 1)
+        WHERE accountId=new.accountId AND threadId=new.threadId AND type=0;
+END;
+CREATE TRIGGER text_events_update_trigger  AFTER UPDATE ON text_events
+FOR EACH ROW
+BEGIN
+    UPDATE threads SET count=(SELECT count(eventId) FROM text_events WHERE
+        accountId=new.accountId AND
+        threadId=new.threadId AND
+        messageType!=2)
+        WHERE accountId=new.accountId AND threadId=new.threadId AND type=0;
+    UPDATE threads SET unreadCount=(SELECT count(eventId) FROM text_events WHERE
+        accountId=new.accountId AND threadId=new.threadId AND newEvent='1' AND messageType!=2)
+        WHERE accountId=new.accountId AND threadId=new.threadId AND type=0;
+    UPDATE threads SET lastEventId=(SELECT eventId FROM text_events WHERE
+        accountId=new.accountId AND
+        threadId=new.threadId AND
+        messageType!=2
+        ORDER BY timestamp DESC LIMIT 1)
+        WHERE accountId=new.accountId AND threadId=new.threadId AND type=0;
+    UPDATE threads SET lastEventTimestamp=(SELECT timestamp FROM text_events WHERE
+        accountId=new.accountId AND
+        threadId=new.threadId AND
+        messageType!=2
+        ORDER BY timestamp DESC LIMIT 1)
+        WHERE accountId=new.accountId AND threadId=new.threadId AND type=0;
+END;
+CREATE TRIGGER text_events_delete_trigger  AFTER DELETE ON text_events
+FOR EACH ROW
+BEGIN
+    UPDATE threads SET count=(SELECT count(eventId) FROM text_events WHERE
+        accountId=old.accountId AND
+        threadId=old.threadId AND
+        messageType!=2)
+        WHERE accountId=old.accountId AND threadId=old.threadId AND type=0;
+    UPDATE threads SET unreadCount=(SELECT count(eventId) FROM text_events WHERE
+        accountId=old.accountId AND threadId=old.threadId AND newEvent='1' AND messageType!=2)
+        WHERE accountId=old.accountId AND threadId=old.threadId AND type=0;
+    UPDATE threads SET lastEventId=(SELECT eventId FROM text_events WHERE
+        accountId=old.accountId AND
+        threadId=old.threadId AND
+        messageType!=2
+        ORDER BY timestamp DESC LIMIT 1)
+        WHERE accountId=old.accountId AND threadId=old.threadId AND type=0;
+    UPDATE threads SET lastEventTimestamp=(SELECT timestamp FROM text_events WHERE
+        accountId=old.accountId AND
+        threadId=old.threadId AND
+        messageType!=2
+        ORDER BY timestamp DESC LIMIT 1)
+        WHERE accountId=old.accountId AND threadId=old.threadId AND type=0;
+    DELETE from text_event_attachments WHERE
+        accountId=old.accountId AND
+        threadId=old.threadId AND
+        eventId=old.eventId;
+END;
only in patch2:
unchanged:
--- history-service-0.1+15.04.20150210.orig/plugins/sqlite/schema/version.info
+++ history-service-0.1+15.04.20150210/plugins/sqlite/schema/version.info
@@ -0,0 +1 @@
+11
only in patch2:
unchanged:
--- history-service-0.1+15.04.20150210.orig/plugins/sqlite/sqlitehistoryplugin.qrc
+++ history-service-0.1+15.04.20150210/plugins/sqlite/sqlitehistoryplugin.qrc
@@ -0,0 +1,17 @@
+<RCC>
+    <qresource prefix="/database">
+        <file>schema/schema.sql</file>
+        <file>schema/v10.sql</file>
+        <file>schema/v11.sql</file>
+        <file>schema/v1.sql</file>
+        <file>schema/v2.sql</file>
+        <file>schema/v3.sql</file>
+        <file>schema/v4.sql</file>
+        <file>schema/v5.sql</file>
+        <file>schema/v6.sql</file>
+        <file>schema/v7.sql</file>
+        <file>schema/v8.sql</file>
+        <file>schema/v9.sql</file>
+        <file>schema/version.info</file>
+    </qresource>
+</RCC>