Merge lp:~nik90/ubuntu/precise/gnome-terminal/keywords into lp:ubuntu/precise/gnome-terminal

Proposed by Nekhelesh Ramananthan on 2012-02-29
Status: Merged
Merge reported by: Didier Roche
Merged at revision: not available
Proposed branch: lp:~nik90/ubuntu/precise/gnome-terminal/keywords
Merge into: lp:ubuntu/precise/gnome-terminal
Diff against target: 17 lines (+4/-3)
1 file modified
gnome-terminal.desktop.in.in (+4/-3)
To merge this branch: bzr merge lp:~nik90/ubuntu/precise/gnome-terminal/keywords
Reviewer Review Type Date Requested Status
Didier Roche Approve on 2012-02-29
Ubuntu branches 2012-02-29 Pending
Review via email: mp+95086@code.launchpad.net

Description of the change

Updated desktop file to include the new keywords and also the new Actions.

To post a comment you must log in.
Didier Roche (didrocks) wrote :

Hey Nekhelesh,
thanks for your contribution to ubuntu and for this merge requests :)

Some notes about it:
- we normally comment the changes in the debian/changelog file. For that, we are using debchange -i and write something like:
- move the .desktop file change into something the patch system of the package can deal with
- the correct branch to target is the one in debian/control: Vcs-Bzr: (which is in that case lp:~ubuntu-desktop/…)

http://developer.ubuntu.com/packaging/html/udd-patchsys.html#edit-patch is something which might interest you in this regard. This is the end result: http://paste.ubuntu.com/855106/

Also, we try to forward the change to Upstream directly. I open a bug in the GNOME bugzilla tracker with this patch attached. We would really appreciate if you can do that yourself next time and stating it on the merge request).

Thanks again for your contribution there! That's really appreciated :)

On this particular one, you would have seen

review: Approve
Didier Roche (didrocks) wrote :

on this particular one, you would have seen that you edit something that it taking care of in two patches, I had to separate then though.

The changed are done in the ubuntu-desktop vcs, marking as "merged"

Didier Roche (didrocks) wrote :

FYI, I removed Terminal;Command from the list as they are part of either the title and description, so they are not reallly needed :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gnome-terminal.desktop.in.in'
2--- gnome-terminal.desktop.in.in 2011-07-19 18:21:19 +0000
3+++ gnome-terminal.desktop.in.in 2012-02-29 01:51:20 +0000
4@@ -13,9 +13,10 @@
5 Categories=GNOME;GTK;Utility;TerminalEmulator;
6 StartupNotify=true
7 OnlyShowIn=GNOME;Unity;
8-X-Ayatana-Desktop-Shortcuts=New
9+Actions=New;
10+_Keywords=Terminal;Command;Run;
11
12-[New Shortcut Group]
13+[Desktop Action New]
14 _Name=New Terminal
15 Exec=gnome-terminal
16-TargetEnvironment=Unity
17+OnlyShowIn=Unity

Subscribers

People subscribed via source and target branches