videolan
/
vlc
mirror of https://gitea.goldendeliverer.com/videolan/vlc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

vlc.desktop: the version in it refers to the standard version not VLC version. 

- don't process it with config.status
       - get rif of the duplicate application/x-matroska
   Pointed by kwizart
pull/2/head
Christophe Mutricy 19 years ago
parent
89a09390d0
commit
fa752a1bd0
2 changed files with 4 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      share/Makefile.am
  2. 4
      share/applications/vlc.desktop

8
share/Makefile.am
View File

@ -1,7 +1,6 @@
EXTRA_DIST = $(DIST_rsrc) \
applications/vlc.desktop.in \
$(skins2_default_vlt_FILES)
MOSTLYCLEANFILES = $(nobase_pkgdata_DATA) $(nobase_data_DATA)
MOSTLYCLEANFILES = $(nobase_pkgdata_DATA)
pkgdatadir = $(datadir)/vlc
@ -22,11 +21,8 @@ nobase_dist_pkgdata_DATA = \
$(DIST_osdmenu_minimal)
nobase_pkgdata_DATA = skins2/default.vlt
nobase_data_DATA = applications/vlc.desktop
nobase_dist_DATA = applications/vlc.desktop
applications/vlc.desktop: applications/vlc.desktop.in $(top_builddir)/config.status
cd "$(top_builddir)" && \
$(SHELL) ./config.status --file=$(subdir)/applications/vlc.desktop
DIST_rsrc = \
newres.h \

4
share/applications/vlc.desktop.in → share/applications/vlc.desktop
View File

@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Version=@VERSION@
Version=1.0
Name=VLC media player
Name[fr]=Lecteur multimédia VLC
Comment=Universal movies and music player
@ -14,4 +14,4 @@ Icon=vlc
Terminal=false
Type=Application
Categories=Application;AudioVideo;Player;
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;application/ogg;application/x-ogg;application/x-matroska;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;application/x-matroska;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;video/vnd.rn-realvideo;audio/x-pn-realaudio-plugin;
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;application/ogg;application/x-ogg;application/x-matroska;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;video/vnd.rn-realvideo;audio/x-pn-realaudio-plugin;
Write Preview
Loading…
Cancel
Save