Merge lp:~boiko/texts-scope/update_to_latest_history into lp:texts-scope

[Gustavo Pichorim Boiko]

Update to latest history-service API and fix building when builddir != srcdir

Update to latest history-service API and fix building when builddir != srcdir

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-09-08 15:18:54 +0000
+++ CMakeLists.txt	2015-10-16 21:37:32 +0000
@@ -1,4 +1,4 @@
-set(VERSION "1.3.6")
+set(VERSION "1.3.6.1")
 
 # Supress qDebug() output
 ADD_DEFINITIONS( -DQT_NO_DEBUG_OUTPUT )
@@ -84,6 +84,6 @@
 add_subdirectory(data)
 add_subdirectory(po)
 
-install(FILES manifest.json DESTINATION "/")
-install(FILES "${PKG_PREFIX}.${PKG}_${APP}.security.json" DESTINATION "/")
+install(FILES ${CMAKE_BINARY_DIR}/manifest.json DESTINATION "/")
+install(FILES "${CMAKE_BINARY_DIR}/${PKG_PREFIX}.${PKG}_${APP}.security.json" DESTINATION "/")
 
 
=== added file 'click-build.sh'
--- click-build.sh	1970-01-01 00:00:00 +0000
+++ click-build.sh	2015-10-16 21:37:32 +0000
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+export LC_ALL=C
+
+CLICKARCH=armhf
+rm -rf $CLICKARCH-build
+mkdir $CLICKARCH-build
+cd $CLICKARCH-build
+cmake ..
+make DESTDIR=../package install
+cd ..
+click build package
 
=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2015-04-06 21:34:04 +0000
+++ data/CMakeLists.txt	2015-10-16 21:37:32 +0000
@@ -15,7 +15,7 @@
 endforeach(INI)
 
 INSTALL(
-    FILES "scope.ini"
+    FILES "${CMAKE_CURRENT_BINARY_DIR}/scope.ini"
     DESTINATION "${SCOPE_INSTALLDIR}"
     RENAME "${PKG_PREFIX}.${PKG}_${APP}.ini"
 )
 
=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2015-04-06 21:34:04 +0000
+++ po/CMakeLists.txt	2015-10-16 21:37:32 +0000
@@ -26,6 +26,6 @@
 endforeach(POFILE)
 
 INSTALL(
-    DIRECTORY "built_mos/"
+    DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/built_mos/"
     DESTINATION "${SCOPE_INSTALLDIR}"
-)
 \ No newline at end of file
+)
 
=== modified file 'src/query.cpp'
--- src/query.cpp	2015-09-08 15:13:40 +0000
+++ src/query.cpp	2015-10-16 21:37:32 +0000
@@ -183,7 +183,7 @@
         tevent.cat = cat;
 
         //get call participants and deduce the caller
-        QList<QString> participants = ev.participants();
+        QStringList participants = ev.participants().identifiers();
         QString caller_raw = participants[0];
         QString caller;
         QString sender = ev.senderId();