* ./debian/vlc.desktop: removed unnecessary file.

diff --git a/debian/Makefile.am b/debian/Makefile.am
index 4c5a69b63b2a92e23881c6766144af9e4ed635d0..146f6bee8e8cf16c6bed8666b62c86cebc27d9ab 100644 (file)
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -6,7 +6,6 @@ EXTRA_DIST = \
        control \
        rules \
        vlc.copyright \
-       vlc.desktop \
        vlc.dirs \
        vlc.docs \
        vlc.menu \

diff --git a/debian/changelog b/debian/changelog
index 4131acf21f8fd8e88599ff3e3c9173590945bf75..89e662765dfeef7d7f74e6deaeac433d4d4ca8f3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ vlc (0.5.0-1) unstable; urgency=low
   * New GUI package: wxvlc (wxWindows).
   * New debian/woody-buildpackage file that can be used to build Woody
     packages.
+  * Made the GNOME desktop entries more user-friendly (Closes: #149749).
 
  -- Samuel Hocevar <sam@zoy.org>  Thu,  4 Jul 2002 17:44:25 +0200
 

diff --git a/debian/rules b/debian/rules
index fd0342daf77b7d7a09537b3ecea814e7dc0b701a..977d68a99c88930caac3322b72b25fbea24cde7e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -110,7 +110,6 @@ install: build
 
        # Package: vlc
        mv debian/vlc/$(VIDDIR)/vlc48x48.png debian/vlc/$(PIXDIR)/vlc.png
-       cp debian/vlc.desktop debian/vlc/$(GNOMEDIR)
        cp debian/gvlc.desktop debian/gvlc/$(GNOMEDIR)
        cp debian/gnome-vlc.desktop debian/gnome-vlc/$(GNOMEDIR)
 

diff --git a/debian/vlc.desktop b/debian/vlc.desktop
deleted file mode 100644 (file)
index b385c6a..0000000
--- a/debian/vlc.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=VLC
-Name[fr]=VLC
-Comment=multimedia player
-Comment[fr]=Lecteur multimédia
-Exec=vlc
-Icon=vlc.png
-Terminal=0
-Type=Application