Merge lp:~paulliu/phone-app/desktop_file_tweak into lp:phone-app

Proposed by Ying-Chun Liu
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 630
Merged at revision: 628
Proposed branch: lp:~paulliu/phone-app/desktop_file_tweak
Merge into: lp:phone-app
Diff against target: 23 lines (+8/-0)
2 files modified
debian/changelog (+6/-0)
phone-app.desktop (+2/-0)
To merge this branch: bzr merge lp:~paulliu/phone-app/desktop_file_tweak
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Gustavo Pichorim Boiko (community) Approve
Bill Filler (community) Approve
Review via email: mp+156552@code.launchpad.net

Commit message

Add X-Ubuntu-Touch and X-Ubuntu-StageHint field into desktop file.

Description of the change

Add X-Ubuntu-Touch and X-Ubuntu-StageHint field into desktop file.

To post a comment you must log in.
Bill Filler (bfiller) wrote :

approved

review: Approve
Gustavo Pichorim Boiko (boiko) wrote :

Can you just make the changelog as unreleased? There are other changes merged that need to be listed in the changelog before it is actually released.

For the next MRs you can just do the required changes and leave the changelog untouched (this avoids conflicts when there are multiple changes going on at the same time)? The changes will be added to the changelog by the time the application is released.

 Other than that, the changes are good to go.

review: Needs Fixing
Gustavo Pichorim Boiko (boiko) wrote :

Looks good now.

review: Approve
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-03-28 20:30:06 +0000
3+++ debian/changelog 2013-04-03 13:55:26 +0000
4@@ -1,3 +1,9 @@
5+phone-app (0.59.5) UNRELEASED; urgency=low
6+
7+ * Add X-Ubuntu-Touch and X-Ubuntu-StageHint field into desktop file.
8+
9+ -- Ying-Chun Liu (PaulLiu) <paul.liu@canonical.com> Tue, 02 Apr 2013 22:50:39 +0800
10+
11 phone-app (0.59.4) quantal; urgency=low
12
13 [ Gustavo Pichorim Boiko ]
14
15=== modified file 'phone-app.desktop'
16--- phone-app.desktop 2013-03-12 18:15:29 +0000
17+++ phone-app.desktop 2013-04-03 13:55:26 +0000
18@@ -7,3 +7,5 @@
19 Terminal=false
20 Icon=phone-app
21 MimeType=x-scheme-handler/contact;x-scheme-handler/call
22+X-Ubuntu-Touch=true
23+X-Ubuntu-StageHint=SideStage

Subscribers

People subscribed via source and target branches