Texts Scope

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

  1. update_to_latest_history
  2. Merge into texts-scope-trunk
Proposed by Gustavo Pichorim Boiko
Status: Merged
Approved by: Kyle Nitzsche
Approved revision: 15
Merge reported by: Kyle Nitzsche
Merged at revision: not available
Proposed branch: lp:~boiko/texts-scope/update_to_latest_history
Merge into: lp:texts-scope
Diff against target: 75 lines (+19/-7)
5 files modified
CMakeLists.txt (+3/-3)
click-build.sh (+12/-0)
data/CMakeLists.txt (+1/-1)
po/CMakeLists.txt (+2/-2)
src/query.cpp (+1/-1)
To merge this branch: bzr merge lp:~boiko/texts-scope/update_to_latest_history
Reviewer Review Type Date Requested Status
texts-scope-team Pending
Review via email: mp+274788@code.launchpad.net

Commit message

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

Description of the change

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

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 2015-09-08 15:18:54 +0000
3+++ CMakeLists.txt 2015-10-16 21:37:32 +0000
4@@ -1,4 +1,4 @@
5-set(VERSION "1.3.6")
6+set(VERSION "1.3.6.1")
7
8 # Supress qDebug() output
9 ADD_DEFINITIONS( -DQT_NO_DEBUG_OUTPUT )
10@@ -84,6 +84,6 @@
11 add_subdirectory(data)
12 add_subdirectory(po)
13
14-install(FILES manifest.json DESTINATION "/")
15-install(FILES "${PKG_PREFIX}.${PKG}_${APP}.security.json" DESTINATION "/")
16+install(FILES ${CMAKE_BINARY_DIR}/manifest.json DESTINATION "/")
17+install(FILES "${CMAKE_BINARY_DIR}/${PKG_PREFIX}.${PKG}_${APP}.security.json" DESTINATION "/")
18
19
20=== added file 'click-build.sh'
21--- click-build.sh 1970-01-01 00:00:00 +0000
22+++ click-build.sh 2015-10-16 21:37:32 +0000
23@@ -0,0 +1,12 @@
24+#!/bin/sh
25+
26+export LC_ALL=C
27+
28+CLICKARCH=armhf
29+rm -rf $CLICKARCH-build
30+mkdir $CLICKARCH-build
31+cd $CLICKARCH-build
32+cmake ..
33+make DESTDIR=../package install
34+cd ..
35+click build package
36
37=== modified file 'data/CMakeLists.txt'
38--- data/CMakeLists.txt 2015-04-06 21:34:04 +0000
39+++ data/CMakeLists.txt 2015-10-16 21:37:32 +0000
40@@ -15,7 +15,7 @@
41 endforeach(INI)
42
43 INSTALL(
44- FILES "scope.ini"
45+ FILES "${CMAKE_CURRENT_BINARY_DIR}/scope.ini"
46 DESTINATION "${SCOPE_INSTALLDIR}"
47 RENAME "${PKG_PREFIX}.${PKG}_${APP}.ini"
48 )
49
50=== modified file 'po/CMakeLists.txt'
51--- po/CMakeLists.txt 2015-04-06 21:34:04 +0000
52+++ po/CMakeLists.txt 2015-10-16 21:37:32 +0000
53@@ -26,6 +26,6 @@
54 endforeach(POFILE)
55
56 INSTALL(
57- DIRECTORY "built_mos/"
58+ DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/built_mos/"
59 DESTINATION "${SCOPE_INSTALLDIR}"
60-)
61\ No newline at end of file
62+)
63
64=== modified file 'src/query.cpp'
65--- src/query.cpp 2015-09-08 15:13:40 +0000
66+++ src/query.cpp 2015-10-16 21:37:32 +0000
67@@ -183,7 +183,7 @@
68 tevent.cat = cat;
69
70 //get call participants and deduce the caller
71- QList<QString> participants = ev.participants();
72+ QStringList participants = ev.participants().identifiers();
73 QString caller_raw = participants[0];
74 QString caller;
75 QString sender = ev.senderId();

Subscribers

People subscribed via source and target branches