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

[Alberto Mardegan]

Adjust the provider IDs in the .service files.

Adjust the provider IDs in the .service files.

Unmerged revisions

25. By Alberto Mardegan on 2014-12-16

Fix the provider ID

24. By Alberto Mardegan on 2014-12-12

Update framework, remove ids

=== modified file 'manifest.json'
--- manifest.json	2014-11-23 04:10:53 +0000
+++ manifest.json	2014-12-16 12:15:10 +0000
@@ -1,7 +1,7 @@
 {
     "architecture": "all",
     "description": "Ubuntu Touch app and account plugin for ownCloud integration.",
-    "framework": "ubuntu-sdk-14.10-qml-dev2",
+    "framework": "ubuntu-sdk-14.10-qml",
     "hooks": {
         "owncloud-app": {
             "apparmor": "owncloud-app.json",
@@ -18,4 +18,4 @@
     "name": "com.ubuntu.developer.danielholm.owncloud-app",
     "title": "owncloud-app",
     "version": "0.1"
-}
 \ No newline at end of file
+}
 
=== modified file 'plugin/data/owncloud-app.service'
--- plugin/data/owncloud-app.service	2014-11-23 04:12:20 +0000
+++ plugin/data/owncloud-app.service	2014-12-16 12:15:10 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<service id="owncloud-app">
+<service>
   <type>owncloud-app</type>
   <name>ownCloud app</name>
   <icon>owncloud</icon>
-  <provider>owncloud</provider>
+  <provider>com.ubuntu.developer.danielholm.owncloud-app_plugin</provider>
   <translations>account-plugins</translations>
 </service>
 
=== modified file 'plugin/data/owncloud-calendar.service'
--- plugin/data/owncloud-calendar.service	2014-11-23 04:10:53 +0000
+++ plugin/data/owncloud-calendar.service	2014-12-16 12:15:10 +0000
@@ -3,6 +3,6 @@
   <type>calendar</type>
   <name>ownCloud Calendar</name>
   <icon>calendar</icon>
-  <provider>owncloud</provider>
+  <provider>com.ubuntu.developer.danielholm.owncloud-app_plugin</provider>
   <translations>account-plugins</translations>
 </service>
 
=== modified file 'plugin/data/owncloud-contacts.service'
--- plugin/data/owncloud-contacts.service	2014-11-23 04:10:53 +0000
+++ plugin/data/owncloud-contacts.service	2014-12-16 12:15:10 +0000
@@ -3,6 +3,6 @@
   <type>contacts</type>
   <name>ownCloud Contacts</name>
   <icon>contacts-app</icon>
-  <provider>owncloud</provider>
+  <provider>com.ubuntu.developer.danielholm.owncloud-app_plugin</provider>
   <translations>account-plugins</translations>
 </service>
 
=== modified file 'plugin/data/owncloud.provider'
--- plugin/data/owncloud.provider	2014-11-23 04:10:53 +0000
+++ plugin/data/owncloud.provider	2014-12-16 12:15:10 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<provider id="owncloud">
+<provider>
   <name>ownCloud</name>
   <icon>owncloud.png</icon>
   <translations>account-plugins</translations>