1
=== modified file 'config.h.in'
2
--- config.h.in	2015-08-26 08:19:56 +0000
3
+++ config.h.in	2016-12-05 15:15:21 +0000
4
@@ -37,7 +37,9 @@
5
37
}
37
}
6
38
38
7
39
inline QString telephonyServiceDir() {
39
inline QString telephonyServiceDir() {
9
40
    if (isRunningInstalled()) {
40
    if (qEnvironmentVariableIsSet("SNAP")) {
10
41
        return QString("%1/@CMAKE_INSTALL_PREFIX@/@TELEPHONY_SERVICE_DIR@/").arg(QString(qgetenv("SNAP")));
11
42
    } else if (isRunningInstalled()) {
12
41
        return QString("@CMAKE_INSTALL_PREFIX@/@TELEPHONY_SERVICE_DIR@/");
43
        return QString("@CMAKE_INSTALL_PREFIX@/@TELEPHONY_SERVICE_DIR@/");
13
42
    } else {
44
    } else {
14
43
        return QString("@CMAKE_SOURCE_DIR@/");
45
        return QString("@CMAKE_SOURCE_DIR@/");
15
@@ -45,7 +47,7 @@
16
45
}
47
}
17
46
48
18
47
inline QString ubuntuPhonePluginPath() {
49
inline QString ubuntuPhonePluginPath() {
20
48
    if (isRunningInstalled()) {
50
    if (isRunningInstalled() || qEnvironmentVariableIsSet("SNAP")) {
21
49
        return QString::null;
51
        return QString::null;
22
50
    } else {
52
    } else {
23
51
        return QString("@CMAKE_SOURCE_DIR@/");
53
        return QString("@CMAKE_SOURCE_DIR@/");
24
52
54
25
=== added directory 'snap'
26
=== added directory 'snap/ubuntu-app-platform'
27
=== added file 'snapcraft.yaml'
28
--- snapcraft.yaml	1970-01-01 00:00:00 +0000
29
+++ snapcraft.yaml	2016-12-05 15:15:21 +0000
30
@@ -0,0 +1,82 @@
31
1
name: telephony-service
32
2
version: 0.1
33
3
summary: Telephony service components for Ubuntu - backend
34
4
description: 
35
5
  Telephony service components for Ubuntu.
36
6
  .
37
7
  This package contains the backend components providing the telephony 
38
8
  features such as calling and texting.
39
9
confinement: devmode
40
10
grade: devel
41
11
42
12
apps:
43
13
  indicator:
44
14
    command: desktop-launch $SNAP/usr/bin/telephony-service-indicator
45
15
    plugs: [platform]
46
16
47
17
  handler:
48
18
    command: desktop-launch $SNAP/usr/bin/telephony-service-handler
49
19
    plugs: [platform]
50
20
51
21
  approver:
52
22
    command: desktop-launch $SNAP/usr/bin/telephony-service-approver
53
23
    plugs: [platform]
54
24
55
25
plugs:
56
26
  platform:
57
27
    interface: content
58
28
    content: ubuntu-app-platform1
59
29
    target: ubuntu-app-platform
60
30
    default-provider: ubuntu-app-platform
61
31
62
32
#slots:
63
33
#  telephony:
64
34
#    interface: telephony
65
35
66
36
parts:
67
37
  telephony-service:
68
38
    plugin: cmake
69
39
    configflags: [-DCMAKE_INSTALL_PREFIX=/usr, -DCMAKE_CROSSCOMPILING=On]
70
40
    source: .
71
41
    build-packages:
72
42
      - cmake
73
43
      - dh-translations
74
44
      - dconf-cli
75
45
      - gnome-keyring
76
46
      - gsettings-ubuntu-schemas
77
47
      - libhistoryservice-dev
78
48
      - libicu-dev
79
49
      - libmessaging-menu-dev
80
50
      - libnotify-dev
81
51
      - libphonenumber-dev
82
52
      - libtelepathy-qt5-dev
83
53
      - libubuntu-application-api-dev
84
54
      - libprotobuf-dev
85
55
      - pkg-config
86
56
      - qt5-default
87
57
      - qtbase5-dev
88
58
      - qtdeclarative5-dev
89
59
      - qtdeclarative5-dev-tools
90
60
      - qtfeedback5-dev
91
61
      - qtdeclarative5-ubuntu-ui-toolkit-plugin
92
62
      - qtmultimedia5-dev
93
63
      - qtpim5-dev
94
64
      - libusermetricsinput1-dev
95
65
      - telepathy-mission-control-5
96
66
      - upstart
97
67
    stage-packages:
98
68
      - accountsservice-ubuntu-touch-schemas
99
69
      - gsettings-ubuntu-schemas
100
70
      - history-service
101
71
      - libnotify4
102
72
      - telepathy-mission-control-5
103
73
      - ubuntu-sounds
104
74
      - tone-generator
105
75
      - libusermetricsinput1
106
76
      - dconf-cli
107
77
    after: [desktop-ubuntu-app-platform]
108
78
109
79
  environment:
110
80
    source: snap
111
81
    plugin: dump
112
82
Reviewer	Review Type	Date Requested	Status
Tiago Salem Herrmann (community)		2016-11-24	Approve on 2016-11-28
system-apps-ci-bot	continuous-integration		Approve on 2016-11-28
Review via email: mp+311716@code.launchpad.net