Merge lp:~ted/ubuntu-clock-app/url-dispatcher into lp:ubuntu-clock-app/saucy

[Ted Gould]

Add URL Dispatcher config file

URL Dispatcher Configuration file to register the alarm:// URL.

This requires an unmerged version of URL dispatcher but should be harmless to merge at anytime.

[Nekhelesh Ramananthan (nik90)]

Hey Ted, I trust your judgement on this since I am not really sure as to what files are required for the URL dispatcher. I am just curious as to why you did not add this file to debian install file? Is this not required on the desktop?

review: Needs Information

[Ted Gould (ted)]

Oh, I didn't know that clock was built into a .deb anywhere? Isn't it just shipped as a .click package?

[Nekhelesh Ramananthan (nik90)]

On the phone it is distributed as a click package. While for testing purposes, it is built and distributed via the Core Apps PPA as a deb package.

[Nekhelesh Ramananthan (nik90)]

https://launchpad.net/~ubuntu-touch-coreapps-drivers/+archive/daily

[Ted Gould (ted)]

I know how to add it to the Debian packaging, but it doesn't seem to be added to the project files. Not sure how to add it to the qmlproject file. Do you know how to do that?

[Nekhelesh Ramananthan (nik90)]

Sorry, I am not sure about that. I will ask michael or david to take a look at this.

[David Planella (dpm)]

You can add it to the Qt Creator project by adding something like this to the .qmlproject file:

    Files {
        filter: "*.url-dispatcher"
    }

You can have a look at an example of the syntax on the current .qmlfile http://bazaar.launchpad.net/~ubuntu-clock-dev/ubuntu-clock-app/trunk/view/head:/ubuntu-clock-app.qmlproject

This will make the file show up in Qt Creator when you open the project.

I would still suggest to add it to the .deb package by reviving r293 to make sure the PPA is in sync with the .click package (some of us have got the packages from the PPA installed on the desktop to test how well core apps work on the bigger form factor).

As per having it added to the click package, I believe it should happen automatically, but to be sure I'd ping sergiusens, as he's creating the .click packages for us.

[Nekhelesh Ramananthan (nik90)]

Just a note, here is michael hall's reply on IRC,

 nik90: I don't think we need that in the debian packages, since the desktop doesn't provide the alarm service anyway and debian packaging doesn't provide the click hooks that appear to be used to register with url-dispatcher

So should we worry about including the .url-dispatcher file in the debian control or .qmlproject file?

[lp:~ted/ubuntu-clock-app/url-dispatcher]

297. By Ted Gould on 2014-01-14

Add url dispatcher to the project file

298. By Ted Gould on 2014-01-14

Adding the URL dispatcher to the install

[Ted Gould (ted)]

On Tue, 2014-01-14 at 17:47 +0000, David Planella wrote:

> You can add it to the Qt Creator project by adding something like this
> to the .qmlproject file:

Cool, that works.

> I would still suggest to add it to the .deb package by reviving r293
> to make sure the PPA is in sync with the .click package (some of us
> have got the packages from the PPA installed on the desktop to test
> how well core apps work on the bigger form factor).

Yup. Added.

> As per having it added to the click package, I believe it should
> happen automatically, but to be sure I'd ping sergiusens, as he's
> creating the .click packages for us.

When I build a click package it is there. So WFM :-)

[Ted Gould (ted)]

On Tue, 2014-01-14 at 17:53 +0000, Nekhelesh Ramananthan wrote:

> nik90: I don't think we need that in the debian packages, since the
> desktop doesn't provide the alarm service anyway and debian packaging
> doesn't provide the click hooks that appear to be used to register
> with url-dispatcher
>
> So should we worry about including the .url-dispatcher file in the
> debian control or .qmlproject file?

It uses a click hook from click packages but a file location when
dealing with debs. It does both as we can't just rely on one because
things like webbrowser aren't migrated at all.

[Nekhelesh Ramananthan (nik90)]

7 +ubuntu-clock-app.url-dispatcher usr/share/url-dispatcher/urls/

Is the destination directory correct? On my 13.10 system, I do not have the url-dispatcher folder in /usr/share. I only see a liburl-dispatcher1 folder.

[Ted Gould (ted)]

On Tue, 2014-01-14 at 20:53 +0000, Nekhelesh Ramananthan wrote:

> Is the destination directory correct? On my 13.10 system, I do not
> have the url-dispatcher folder in �usr�share. I only see a
> liburl-dispatcher1 folder.

Yup. You don't have an apps that have registered URLs with
url-dispatcher on your system today. That'll change :-)

[Nekhelesh Ramananthan (nik90)]

> On Tue, 2014-01-14 at 20:53 +0000, Nekhelesh Ramananthan wrote:
>
> > Is the destination directory correct? On my 13.10 system, I do not
> > have the url-dispatcher folder in �usr�share. I only see a
> > liburl-dispatcher1 folder.
>
>
> Yup. You don't have an apps that have registered URLs with
> url-dispatcher on your system today. That'll change :-)

In that case, I think the MP looks good. Approving.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'debian/ubuntu-clock-app.install'
--- debian/ubuntu-clock-app.install	2013-04-11 20:19:21 +0000
+++ debian/ubuntu-clock-app.install	2014-01-14 20:27:17 +0000
@@ -1,5 +1,6 @@
 ubuntu-clock-app usr/bin/
 ubuntu-clock-app.desktop usr/share/applications/
+ubuntu-clock-app.url-dispatcher usr/share/url-dispatcher/urls/
 *.qml usr/share/ubuntu-clock-app/
 *.png usr/share/ubuntu-clock-app/
 alarm usr/share/ubuntu-clock-app/

=== modified file 'manifest.json'
--- manifest.json	2014-01-13 12:14:17 +0000
+++ manifest.json	2014-01-14 20:27:17 +0000
@@ -4,7 +4,8 @@
     "hooks": {
         "clock": {
             "apparmor": "apparmor/clock.json", 
-            "desktop": "ubuntu-clock-app.desktop"
+            "desktop": "ubuntu-clock-app.desktop",
+            "urls": "ubuntu-clock-app.url-dispatcher"
         }
     }, 
     "icon": "clock64.png", 

=== modified file 'ubuntu-clock-app.qmlproject'
--- ubuntu-clock-app.qmlproject	2013-09-26 06:09:03 +0000
+++ ubuntu-clock-app.qmlproject	2014-01-14 20:27:17 +0000
@@ -19,6 +19,10 @@
     Files {
         filter: "README*"
     }
+    /* URL dispatcher configuration */
+    Files {
+        filter: "*.url-dispatcher"
+    }
     /* Shows the translation files and the .pro file used to generate the .pot template */
     Files {
         filter: "*.po*"

=== added file 'ubuntu-clock-app.url-dispatcher'
--- ubuntu-clock-app.url-dispatcher	1970-01-01 00:00:00 +0000
+++ ubuntu-clock-app.url-dispatcher	2014-01-14 20:27:17 +0000
@@ -0,0 +1,5 @@
+[
+	{
+		"protocol": "alarm"
+	}
+]