Merge lp:~nik90/ubuntu/precise/eog/keywords into lp:ubuntu/precise/eog

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/eog/keywords
Merge into: lp:ubuntu/precise/eog
Diff against target: 8 lines (+1/-0)
1 file modified
data/ (+1/-0)
To merge this branch: bzr merge lp:~nik90/ubuntu/precise/eog/keywords
Reviewer Review Type Date Requested Status
Didier Roche Approve on 2012-02-29
Ubuntu branches 2012-02-29 Pending
Review via email:

Description of the Change

Added keywords as per the XDG specs.

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/…) is something which might interest you in this regard. This is the end result:

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 :)

review: Approve
Didier Roche (didrocks) wrote :

FYI, I set the proposal as "merged" but I in fact merged the ubuntu-desktop branch :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/'
2--- data/ 2011-05-02 11:11:08 +0000
3+++ data/ 2012-02-29 02:05:20 +0000
4@@ -14,3 +14,4 @@
5 X-GNOME-Bugzilla-Version=@VERSION@
6 X-GNOME-DocPath=eog/eog.xml
7 MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-bmp;image/x-gray;image/x-icb;image/x-ico;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-xbitmap;image/x-xpixmap;image/x-pcx;image/svg+xml;image/svg+xml-compressed;image/vnd.wap.wbmp;


People subscribed via source and target branches