[SCM] VLC media player packaging branch, sid, updated. debian/1.0.4-2-6-ge499e5e

[xtophe-guest at users.alioth.debian.org]

The following commit has been merged in the sid branch:
commit 4ffd38c632908adc3fee623635b5fb28aed9dabf
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Sat Jan 9 18:41:44 2010 +0000

    Add comments to overrides file

diff --git a/debian/vlc.lintian-overrides b/debian/vlc.lintian-overrides
index d0b97d0..23585aa 100644
--- a/debian/vlc.lintian-overrides
+++ b/debian/vlc.lintian-overrides
@@ -1,2 +1,4 @@
+# The vlc executable is in vlc-nox but the .desktop file is only relevant to vlc(-with-x)
 vlc binary: desktop-command-not-in-package /usr/share/applications/vlc.desktop vlc
+# The icon is in vlc-data (the arch=all package)
 vlc binary: menu-icon-missing /usr/share/vlc/vlc.xpm

-- 
VLC media player packaging