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

Proposed by Nekhelesh Ramananthan
Status: Rejected
Rejected by: Martin Pitt
Proposed branch: lp:~nik90/ubuntu/precise/vlc/keywords
Merge into: lp:ubuntu/precise/vlc
Diff against target: 8 lines (+1/-0)
1 file modified
share/ (+1/-0)
To merge this branch: bzr merge lp:~nik90/ubuntu/precise/vlc/keywords
Reviewer Review Type Date Requested Status
Didier Roche Disapprove
Ubuntu branches Pending
Review via email:

Description of the change

Edited the desktop file to include the new keywords based on the new XDG specifications.

To post a comment you must log in.
Revision history for this message
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
- we are in sync with debian for that, and don't really want to be not in sync anymore for only that 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 opened a bug in the vlc 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 :)

Also, you are repeating some words that are in the application name or the comment that are used for searching. I removed them.

I'm disapproving this branch, but look at upstream bug tracker

review: Disapprove
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

@Didier Roche, I see that you also reported the bug upstream to trac vlc with the modified patch. Should I upload again here with the new patch? Again thank you for all the support.

Revision history for this message
Didier Roche (didrocks) wrote :

@Nekhelesh: no, that's fine, this will directly pend on the upstream to take it because we are in sync with debian and we don't want to diverge for a keyword change. So, when upstream will take it, we will get in by debian directly. (maybe not right now, but will come in the future).

Thanks again ;)

Unmerged revisions

109. By Nekhelesh Ramananthan <email address hidden>

Added keywords to the desktop file accordingto the new specifications

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'share/'
2--- share/ 2012-02-13 01:34:02 +0000
3+++ share/ 2012-02-29 01:39:39 +0000
4@@ -96,3 +96,4 @@
5 Categories=AudioVideo;Player;
6 MimeType=video/dv;video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;video/x-flv;video/vnd.rn-realvideo;video/mp4;video/mp4v-es;video/mp2t;application/ogg;application/x-ogg;video/x-ogm+ogg;audio/x-vorbis+ogg;application/x-matroska;audio/x-matroska;video/x-matroska;video/webm;audio/webm;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-m4a;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;application/x-flac;audio/x-flac;application/x-shockwave-flash;misc/ultravox;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;audio/x-pn-realaudio-plugin;application/x-extension-mp4;audio/mp4;audio/amr;audio/amr-wb;x-content/video-vcd;x-content/video-svcd;x-content/video-dvd;x-content/audio-cdda;x-content/audio-player;application/xspf+xml;x-scheme-handler/mms;x-scheme-handler/rtmp;x-scheme-handler/rtsp;
7 X-KDE-Protocols=ftp,http,https,mms,rtmp,rtsp,sftp,smb


People subscribed via source and target branches