1
=== modified file 'debian/ubuntu-download-manager.install'
2
--- debian/ubuntu-download-manager.install	2014-10-14 15:26:46 +0000
3
+++ debian/ubuntu-download-manager.install	2016-11-29 16:00:55 +0000
4
@@ -4,3 +4,4 @@
5
4
debian/usr.lib.ubuntu-download-manager.udm-extractor etc/apparmor.d
4
debian/usr.lib.ubuntu-download-manager.udm-extractor etc/apparmor.d
6
5
etc/dbus-1/system.d/com.canonical.applications.Downloader.conf
5
etc/dbus-1/system.d/com.canonical.applications.Downloader.conf
7
6
usr/lib/*/ubuntu-download-manager/*
6
usr/lib/*/ubuntu-download-manager/*
8
7
usr/lib/systemd/user
9
7
8
10
=== added file 'snapcraft.yaml'
11
--- snapcraft.yaml	1970-01-01 00:00:00 +0000
12
+++ snapcraft.yaml	2016-11-29 16:00:55 +0000
13
@@ -0,0 +1,32 @@
14
1
name: ubuntu-download-manager
15
2
version: 0.100
16
3
summary: Ubuntu Download Manager
17
4
description: Provides a service for downloading files while an application is suspended.
18
5
confinement: strict
19
6
20
7
apps:
21
8
    ubuntu-download-manager:
22
9
        command: desktop-launch ubuntu-download-manager
23
10
        plugs: [network, network-manager, network-observe, dbus]
24
11
        slots: [download]
25
12
26
13
parts:
27
14
    ubuntu-download-manager:
28
15
        source: .
29
16
        plugin: cmake
30
17
        build-packages:
31
18
            - build-essential
32
19
            - cmake
33
20
            - dbus
34
21
            - pkg-config
35
22
            - qtdeclarative5-dev-tools
36
23
            - qt5-default
37
24
            - qtbase5-dev
38
25
            - qtdeclarative5-dev
39
26
            - doxygen
40
27
            - libgl1-mesa-dev
41
28
            - libgles2-mesa-dev
42
29
            - libglib2.0-dev
43
30
        stage-packages:
44
31
            - libqt5sql5-sqlite
45
32
        after: [desktop/qt5] 
46
0
33
47
=== modified file 'src/common/priv/ubuntu/transfers/system/apparmor.cpp'
48
--- src/common/priv/ubuntu/transfers/system/apparmor.cpp	2014-10-22 23:32:28 +0000
49
+++ src/common/priv/ubuntu/transfers/system/apparmor.cpp	2016-11-29 16:00:55 +0000
50
@@ -165,12 +165,24 @@
51
165
        QString dataPath = QStandardPaths::writableLocation(
165
        QString dataPath = QStandardPaths::writableLocation(
52
166
            QStandardPaths::DataLocation);
166
            QStandardPaths::DataLocation);
53
167
        QStringList pathComponents;
167
        QStringList pathComponents;
54
168
        pathComponents << dataPath;
55
169
168
56
170
        if (!appId.isEmpty()) {
169
        if (!appId.isEmpty()) {
57
171
            QStringList appIdInfo = appId.split("_");
170
            QStringList appIdInfo = appId.split("_");
60
172
            if (appIdInfo.count() > 0)
171
            if (appIdInfo.count() > 0) {
61
173
                pathComponents << appIdInfo[0];
172
                if (appIdInfo[0].startsWith("snap.")) {
62
173
                    // Snap path
63
174
                    QStringList appComponents = appIdInfo[0].split(".");
64
175
                    if (QDir::homePath().contains(QStringLiteral("snap/ubuntu-download-manager"))) {
65
176
                        // We're running inside a snap so adjust the $HOME location accordingly
66
177
                        pathComponents << QDir::homePath() << ".." << ".." << appComponents[1] << "common";
67
178
                    } else {
68
179
                        pathComponents << QDir::homePath() << "snap" << appComponents[1] << "common";
69
180
                    }
70
181
                } else {
71
182
                    // Click path
72
183
                    pathComponents << dataPath << appIdInfo[0];
73
184
                }
74
185
            }
75
174
        }
186
        }
76
175
187
77
176
        pathComponents << "Downloads";
188
        pathComponents << "Downloads";
78
177
189
79
=== modified file 'src/downloads/daemon/CMakeLists.txt'
80
--- src/downloads/daemon/CMakeLists.txt	2014-04-21 14:14:33 +0000
81
+++ src/downloads/daemon/CMakeLists.txt	2016-11-29 16:00:55 +0000
82
@@ -28,6 +28,12 @@
83
28
	ubuntu-download-manager-priv
28
	ubuntu-download-manager-priv
84
29
)
29
)
85
30
30
86
31
set (SYSTEMD_USER_DIR "/usr/lib/systemd/user")
87
32
install(
88
33
  FILES ubuntu-download-manager-systemd.service
89
34
  DESTINATION ${SYSTEMD_USER_DIR}
90
35
)
91
36
92
31
install(FILES ${TARGET}.service DESTINATION
37
install(FILES ${TARGET}.service DESTINATION
93
32
   	${CMAKE_INSTALL_DATADIR}/dbus-1/services)
38
   	${CMAKE_INSTALL_DATADIR}/dbus-1/services)
94
33
install(FILES "com.canonical.applications.Downloader.service" DESTINATION
39
install(FILES "com.canonical.applications.Downloader.service" DESTINATION
95
34
40
96
=== modified file 'src/downloads/daemon/com.canonical.applications.Downloader.service'
97
--- src/downloads/daemon/com.canonical.applications.Downloader.service	2013-09-19 11:07:05 +0000
98
+++ src/downloads/daemon/com.canonical.applications.Downloader.service	2016-11-29 16:00:55 +0000
99
@@ -2,3 +2,4 @@
100
2
Name=com.canonical.applications.Downloader
2
Name=com.canonical.applications.Downloader
101
3
User=root
3
User=root
102
4
Exec=/usr/bin/ubuntu-download-manager
4
Exec=/usr/bin/ubuntu-download-manager
103
5
SystemdService=ubuntu-download-manager-systemd.service
104
5
6
105
=== added file 'src/downloads/daemon/ubuntu-download-manager-systemd.service'
106
--- src/downloads/daemon/ubuntu-download-manager-systemd.service	1970-01-01 00:00:00 +0000
107
+++ src/downloads/daemon/ubuntu-download-manager-systemd.service	2016-11-29 16:00:55 +0000
108
@@ -0,0 +1,7 @@
109
1
[Unit]
110
2
Description=Ubuntu Download Manager Service
111
3
112
4
[Service]
113
5
Type=dbus
114
6
BusName=com.canonical.applications.Downloader
115
7
ExecStart=/usr/bin/ubuntu-download-manager
Status:	Merged
Approved by:	Bill Filler on 2016-11-29
Approved revision:	378
Merged at revision:	379
Proposed branch:	lp:~michael-sheldon/ubuntu-download-manager/snap
Merge into:	lp:ubuntu-download-manager
Diff against target:	115 lines (+62/-3) 6 files modified debian/ubuntu-download-manager.install (+1/-0) snapcraft.yaml (+32/-0) src/common/priv/ubuntu/transfers/system/apparmor.cpp (+15/-3) src/downloads/daemon/CMakeLists.txt (+6/-0) src/downloads/daemon/com.canonical.applications.Downloader.service (+1/-0) src/downloads/daemon/ubuntu-download-manager-systemd.service (+7/-0)
To merge this branch:	bzr merge lp:~michael-sheldon/ubuntu-download-manager/snap
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Needs Fixing on 2016-11-29
Lukáš Tinkl (community)		2016-11-23	Needs Fixing on 2016-11-29
Review via email: mp+311611@code.launchpad.net