vlc.desktop: the version in it refers to the standard version not VLC version.
authorChristophe Mutricy <xtophe@videolan.org>
Mon, 23 Jul 2007 21:29:35 +0000 (21:29 +0000)
committerChristophe Mutricy <xtophe@videolan.org>
Mon, 23 Jul 2007 21:29:35 +0000 (21:29 +0000)
       - don't process it with config.status
       - get rif of the duplicate application/x-matroska
   Pointed by kwizart

share/Makefile.am
share/applications/vlc.desktop [new file with mode: 0644]
share/applications/vlc.desktop.in [deleted file]

index df0484b..43d230e 100644 (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 \
diff --git a/share/applications/vlc.desktop b/share/applications/vlc.desktop
new file mode 100644 (file)
index 0000000..8703edf
--- /dev/null
@@ -0,0 +1,17 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Name=VLC media player
+Name[fr]=Lecteur multimédia VLC
+Comment=Universal movies and music player
+Comment[fr]=Lecteur universel pour films et musique
+Name[sv]=Mediaspelaren VLC
+Comment[sv]=Allmän uppspelare av film och musik
+Name[ru]=Медиаплеер VLC
+Comment[ru]=Универсальный проигрыватель видео и аудио
+Exec=vlc
+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;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;
diff --git a/share/applications/vlc.desktop.in b/share/applications/vlc.desktop.in
deleted file mode 100644 (file)
index f9d5113..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=@VERSION@
-Name=VLC media player
-Name[fr]=Lecteur multimédia VLC
-Comment=Universal movies and music player
-Comment[fr]=Lecteur universel pour films et musique
-Name[sv]=Mediaspelaren VLC
-Comment[sv]=Allmän uppspelare av film och musik
-Name[ru]=Медиаплеер VLC
-Comment[ru]=Универсальный проигрыватель видео и аудио
-Exec=vlc
-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;