Merge lp:~ted/click/desktop-hook-ual into lp:click

Proposed by Ted Gould on 2014-06-05
Status: Superseded
Proposed branch: lp:~ted/click/desktop-hook-ual
Merge into: lp:click
Diff against target: 9 lines (+1/-1)
1 file modified
debian/click.click-desktop.click-hook (+1/-1)
To merge this branch: bzr merge lp:~ted/click/desktop-hook-ual
Reviewer Review Type Date Requested Status
Colin Watson 2014-06-05 Resubmit on 2014-06-05
Review via email: mp+222223@code.launchpad.net

This proposal has been superseded by a proposal from 2014-06-05.

Commit message

Check for ubuntu-app-launch-desktop hook

Description of the change

Make sure we don't have multiple people making the desktop files.

To post a comment you must log in.
Colin Watson (cjwatson) wrote :

Looks good, but could you please resubmit this against lp:click/devel?

review: Resubmit

Unmerged revisions

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/click.click-desktop.click-hook'
2--- debian/click.click-desktop.click-hook 2013-09-04 13:25:45 +0000
3+++ debian/click.click-desktop.click-hook 2014-06-05 16:11:11 +0000
4@@ -1,4 +1,4 @@
5 User-Level: yes
6 Pattern: ${home}/.local/share/click/hooks/desktop/${id}.desktop
7-Exec: [ -e /usr/share/click/hooks/upstart-app-launch-desktop.hook ] || click desktophook
8+Exec: [ -e /usr/share/click/hooks/ubuntu-app-launch-desktop.hook ] || [ -e /usr/share/click/hooks/upstart-app-launch-desktop.hook ] || click desktophook
9 Hook-Name: desktop

Subscribers

People subscribed via source and target branches

to all changes: