Merge lp:~alecu/click/rename-app-launch-in-clickhook into lp:click

[Alejandro J. Cura]

Rename upstart-app-launch to ubuntu-app-launch in the desktop hook

[Colin Watson (cjwatson)]

I prefer the approach in https://code.launchpad.net/~ted/click/desktop-hook-ual/+merge/222223; that's consistent with how I've handled this elsewhere.

review: Disapprove

Unmerged revisions

430. By Alejandro J. Cura on 2014-06-05

Rename upstart-app-launch to ubuntu-app-launch in the desktop hook

429. By PS Jenkins bot on 2014-06-04

Releasing 0.4.24

428. By Colin Watson on 2014-06-04

Click 0.4.24: Add 14.10 framework to "click chroot"; fix getpwnam caching; handle renaming of upstart-app-launch to ubuntu-app-launch. Fixes: 1323998

427. By PS Jenkins bot on 2014-05-20

Releasing 0.4.23.1

426. By Michael Vogt on 2014-05-20

Click 0.4.23: handle framework removal, x86 chroot support, and various other small fixes. Fixes: 1271944, 1294659, 1296820, 1319153, 1320786

=== modified file 'debian/click.click-desktop.click-hook'
--- debian/click.click-desktop.click-hook	2013-09-04 13:25:45 +0000
+++ debian/click.click-desktop.click-hook	2014-06-05 16:11:35 +0000
@@ -1,4 +1,4 @@
 User-Level: yes
 Pattern: ${home}/.local/share/click/hooks/desktop/${id}.desktop
-Exec: [ -e /usr/share/click/hooks/upstart-app-launch-desktop.hook ] || click desktophook
+Exec: [ -e /usr/share/click/hooks/ubuntu-app-launch-desktop.hook ] || click desktophook
 Hook-Name: desktop