ownCloud App

Merge lp:~mardy/owncloud-app/test-se into lp:owncloud-app

  1. test-se
  2. Merge into trunk
Proposed by Alberto Mardegan
Status: Approved
Approved by: Daniel Holm
Approved revision: 25
Proposed branch: lp:~mardy/owncloud-app/test-se
Merge into: lp:owncloud-app
Diff against target: 69 lines (+7/-7)
5 files modified
manifest.json (+2/-2)
plugin/data/owncloud-app.service (+2/-2)
plugin/data/owncloud-calendar.service (+1/-1)
plugin/data/owncloud-contacts.service (+1/-1)
plugin/data/owncloud.provider (+1/-1)
To merge this branch: bzr merge lp:~mardy/owncloud-app/test-se
Reviewer Review Type Date Requested Status
Daniel Holm Pending
Review via email: mp+244849@code.launchpad.net

Commit message

Adjust the provider IDs in the .service files.

Description of the change

Adjust the provider IDs in the .service files.

To post a comment you must log in.

Unmerged revisions

25. By Alberto Mardegan

Fix the provider ID

24. By Alberto Mardegan

Update framework, remove ids

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'manifest.json'
2--- manifest.json 2014-11-23 04:10:53 +0000
3+++ manifest.json 2014-12-16 12:15:10 +0000
4@@ -1,7 +1,7 @@
5 {
6 "architecture": "all",
7 "description": "Ubuntu Touch app and account plugin for ownCloud integration.",
8- "framework": "ubuntu-sdk-14.10-qml-dev2",
9+ "framework": "ubuntu-sdk-14.10-qml",
10 "hooks": {
11 "owncloud-app": {
12 "apparmor": "owncloud-app.json",
13@@ -18,4 +18,4 @@
14 "name": "com.ubuntu.developer.danielholm.owncloud-app",
15 "title": "owncloud-app",
16 "version": "0.1"
17-}
18\ No newline at end of file
19+}
20
21=== modified file 'plugin/data/owncloud-app.service'
22--- plugin/data/owncloud-app.service 2014-11-23 04:12:20 +0000
23+++ plugin/data/owncloud-app.service 2014-12-16 12:15:10 +0000
24@@ -1,8 +1,8 @@
25 <?xml version="1.0" encoding="UTF-8"?>
26-<service id="owncloud-app">
27+<service>
28 <type>owncloud-app</type>
29 <name>ownCloud app</name>
30 <icon>owncloud</icon>
31- <provider>owncloud</provider>
32+ <provider>com.ubuntu.developer.danielholm.owncloud-app_plugin</provider>
33 <translations>account-plugins</translations>
34 </service>
35
36=== modified file 'plugin/data/owncloud-calendar.service'
37--- plugin/data/owncloud-calendar.service 2014-11-23 04:10:53 +0000
38+++ plugin/data/owncloud-calendar.service 2014-12-16 12:15:10 +0000
39@@ -3,6 +3,6 @@
40 <type>calendar</type>
41 <name>ownCloud Calendar</name>
42 <icon>calendar</icon>
43- <provider>owncloud</provider>
44+ <provider>com.ubuntu.developer.danielholm.owncloud-app_plugin</provider>
45 <translations>account-plugins</translations>
46 </service>
47
48=== modified file 'plugin/data/owncloud-contacts.service'
49--- plugin/data/owncloud-contacts.service 2014-11-23 04:10:53 +0000
50+++ plugin/data/owncloud-contacts.service 2014-12-16 12:15:10 +0000
51@@ -3,6 +3,6 @@
52 <type>contacts</type>
53 <name>ownCloud Contacts</name>
54 <icon>contacts-app</icon>
55- <provider>owncloud</provider>
56+ <provider>com.ubuntu.developer.danielholm.owncloud-app_plugin</provider>
57 <translations>account-plugins</translations>
58 </service>
59
60=== modified file 'plugin/data/owncloud.provider'
61--- plugin/data/owncloud.provider 2014-11-23 04:10:53 +0000
62+++ plugin/data/owncloud.provider 2014-12-16 12:15:10 +0000
63@@ -1,5 +1,5 @@
64 <?xml version="1.0" encoding="UTF-8"?>
65-<provider id="owncloud">
66+<provider>
67 <name>ownCloud</name>
68 <icon>owncloud.png</icon>
69 <translations>account-plugins</translations>

Subscribers

People subscribed via source and target branches

to all changes: