* ./ChangeLog: updated.

  * ./README: removed much outdated data.
  * ./debian/*: great package renaming - names should make more sense now.

ChangeLog

@@ -5,6 +5,119 @@
 0.5.0
 Not released yet
 
+  * ./README: removed much outdated data.
+  * ./debian/*: great package renaming - names should make more sense now.
+  * ./plugins/mad/mad_libmad.c: prevent the MAD decoder from looping endlessly
+    when the audio output fifo could not be created.
+  * ./plugins/gtk/*: new generic "Open Target" window. Please test and
+    comment on usability.
+  * ./debian/rules: the Debian package creation script builds ffmpeg.
+  * ./plugins/mpeg_system/mpeg_audio.c: we skip the ID3 tag at the begining
+    of an MP3, so more files can be read.
+  * ./src/vlc.c: reduced the amount of default simultaneous interfaces.
+  * ./src/libvlc.c: removed calls to vlc_mutex_lock in sighandlers.
+  * ./plugins/qt/intf_qt.cpp: fixed Qt interface termination.
+  * ./FAQ: new entry for RTP.
+  * ./FAQ: minor updates, new sections: uninstall/reinstall,
+    DirectX-blackscreen, device permissions, debug messages,
+    config file, (un)planned ports/features, sources.list.
+  * ./plugins/avi/avi.c: now you can see avi over http (true interleaved
+    file only), and seek is allowed.
+  * ./plugins/win32/about.*: added the version number in the About box.
+  * ./src/misc/darwin_specific.c, ./src/misc/extras.c: moved our custom
+    strndup to a separate file so that Win32 can benefit from it.
+  * ./include/vlc_threads.h: Borland compilation fix.
+  * ./mozilla/*: preliminary Mozilla plugin. Only works under Unix for now.
+  * ./debian/rules: activated the vlc-xosd, vlc-kde and mozilla-plugin-vlc
+    Debian packages.
+  * ./po/*: updated potfiles.
+  * ./src/misc/modules.c: module_Need accepts a comma-separated list of
+    module names. Try for instance: "vlc --intf gnome,gtk,dummy".
+  * ./src/misc/darwin_specific.c: added strndup needed by video_output.c.
+  * ./configure.in: added -lintl to plugins_LDFLAGS.
+  * ./plugins/gnome/gtk.c, ./plugins/gnome/gnome.c: prevent older versions
+    of vlc from crashing when trying to open a recent module.
+  * ./plugins/x11/xcommon.c: to enter fullscreen mode, we create a new window
+    instead of moving the current window, which saves us the hassle of
+    remembering size and position.                                    
+  * ./plugins/x11/x11.c, ./plugins/x11/xvideo.c: added --no-x11-shm and
+    --no-xvideo-shm options.                                           
+  * ./plugins/avi/avi.c: begin to support VOD, but it segfault very quickly
+    (unless you disable audio or video!) and cannot support seeking( will
+    just stop ). Moreover it can't work for all files, only interleaved ones.
+  * ./plugins/lirc/lirc.c: the lirc interface now works again.
+  * ./plugins/qt/*: the Qt interface now works again.
+  * ./plugins/kde/*: the KDE interface now works again.
+  * ./plugins/gtk/gtk_callbacks.c: fixed a segfault when hitting Eject with
+    an emtpy playlist.
+  * ./plugins/avi/avi.c: fix some problems with broken avi.
+  * ./plugins/avi/avi.c: audio seems to be better.
+  * ./plugins/dvd/dvd_es.c: error in selecting SPU stream.
+  * ./plugins/spudec/spu_decoder.c: endianness fix for subtitles colour.
+  * ./plugins/spudec/spu_decoder.c: little hack for preventing blank alpha
+    palette.   
+  * ./plugins/spudec/spu_decoder.c: subtitle transparency support.
+  * ./src/misc/modules.c: added the --plugin-path option to give vlc an
+    extra plugin location.
+  * ./plugins/text/rc.c: if stdin/stdout are not connected to a TTY, we
+    don't launch the rc interface.
+  * ./plugins/access/http.c: fixed a compilation warning.
+  * ./src/misc/messages.c: cosmetic enhancements in the message output.
+  * ./plugins/x11/*: added the --x11-drawable and --xvideo-drawable options to
+    tell vlc to draw in an existing drawable instead of creating a new window.
+  * ./plugins/avi/*: I rewrite the way to read, in order to minimize seeking
+    (faster and in prevision of VOD by http, but not yet functionnal ). But
+    sound becomes horrible, I will try to fix it as soon as possible.
+  * ./plugins/macosx/vout_vlc_wrapper.m: arrow-up and arrow-down allow to 
+    control the sound volume.
+  * ./plugins/access/http.c: for streams which are not seekable, we fall
+    back on old HTTP/1.0 behavior; on systems implementing atoll() we
+    can also read files > 2 GB.
+  * ./configure: atoll() detection.
+  * ./plugins/macosx/intf_vlc_wrapper.m: fixed a bug with the language and
+    subtitle menus.
+  * ./README.MacOSX.rtf: more documentation.
+  * ./include/configuration.h: renamed MODULE_CONFIG_* macros into CONFIG_*.
+  * ./include/configuration.h, ./plugins/gtk/gtk_preferences.c,
+    ./plugins/filter/transform.c, ./plugins/filter/distort.c,
+    ./plugins/filter/deinterlace.c: added an ADD_STRING_FROM_LIST()
+    configuration macro.
+  * ./include/modules.h, ./include/video_output.h,
+    ./src/video_output/video_output.c, ./plugins/filters/*: added a
+    VOUT_FILTER capability. Having a clear distinction between VOUTs and
+    VOUT_FILTERs allows us to get rid of ugly hacks. The filters are also
+    stackable now (use --filter=foo:bar:foo etc..).
+  * ./include/configuration.h, ./src/libvlc.h, ./src/libvlc.c: clean-up +
+    added an ADD_USAGE_HINT() configuration macro.
+  * ./FAQ: added QT6 FAQ entry.
+  * ./configure.in: fixed inet_pton detection.
+  * ./plugins/filter/deinterlace.c: the blend mode is now a lot smoother, but
+    also a bit slower, so I also kept the old version, optimized it, and     
+    called it "mean".                                                   
+  * ./plugins/network/ipv6.c: IPv6 multicast support, courtesy of Remco
+    Poortinga <poortinga@telin.nl>.
+  * ./extras/MacOSX/Resources/*: Mac OS X icons and fixes, courtesy of Benjamin
+    Mironer <bmironer@noos.fr>.
+  * ./plugins/filter/deinterlace.c: added two new deinterlacing methods,
+    we now have "discard", "blend", "bob" and "linear".
+  * ./plugins/mad/mad_libmad.c: changed error messages to warning/debug.
+  * ./plugins/macosx/*: additional minor fixes.
+  * ./plugins/macosx/vout_macosx.m, ./plugins/macosx/aout_macosx.m,
+    ./plugins/macosx/intf_vlc_wrapper.m: preliminary OS X compilation fixes.
+  * ./include/vlc_threads.h, ./src/misc/threads.c: improved the cond_wait
+    implementation to avoid races, by using SetEvent instead of PulseEvent.
+  * ./plugins/xosd/xosd.c: a couple more options, better defaults.
+  * ./configure.in: checking for the header should be enough in most cases.
+  * ./plugins/xosd/xosd.c: configuration options.
+  * ./plugins/win32/*: tried to port the Win32 interface to the new API. Seems
+    to be still crashing.
+  * ./plugins/gtk/gtk_callbacks.c: some code cleaning.
+  * ./plugins/text/rc.c: fixed the "a" command.
+  * ./plugins/xosd/*: basic On Screen Display intf-plugin based on libxosd
+  * ./src/misc/netutils.c: network mode works again.
+  * ./plugins/gtk/*: the Gnome/Gtk+ interfaces have all their features back.
+  * ./src/playlist/playlist.c: fixed an off-by-one loop error.
+  * ./plugins/a52_system/.cvsignore: what about a little .cvsignore ?
   * ./plugins/dummy/input_dummy.c: dummy targets such as vlc:nop, vlc:loop
     and vlc:quit work again.
   * ./src/playlist/playlist.c: when a new target is added, for instance through

README

 README for vlc, the VideoLAN Client
-
-
-Introduction
-============
-
-The vlc is part of the VideoLAN project, a full MPEG2 client/server
-solution. The VideoLAN Client can also be used as a standalone program
-to play MPEG2 streams from a hard disk or a DVD.
-
-
-Building, Installing and Running VideoLAN
-=========================================
-
-See the INSTALL file for this.
-
-
-Troubleshooting
-===============
-
-Please check the file FAQ before doing any bug report.
-
-A mailing-list has been set up for support and discussion about the
-vlc. Its address is :
-
-   <vlc@videolan.org>
-
-To subscribe, send a mail to <listar@videolan.org> with the following
-words in the mail body :
-
-   subscribe vlc
-
-To unsubscribe, do the same with the words :
-
-   unsubscribe vlc
-
-
-When reporting bugs, try to be as precise as possible (which OS, which
-distribution, what plugins you were trying, and so on).
-
+===================================
+
+ABOUT-NLS          - Notes on the Free Translation Project.
+AUTHORS            - All the people who worked on vlc.
+BUGS               - List of known, unresolved bugs.
+COPYING            - The GPL license.
+ChangeLog          - The vlc ChangeLog.
+FAQ                - Commonly asked questions.
+INSTALL            - Installation instructions.
+INSTALL.libmad     - Installation instructions for the libmad library.
+INSTALL.win32      - Installation instructions for the Win32 version of vlc.
+MODULES            - Short description of all the available modules.
+README             - This file.
+README.MacOSX.rtf  - Information specific to the MacOS X port.
+TODO               - Work needed.
+doc/               - miscellaneous documentation.
 
 Resources
 =========
 
-The VideoLAN web site at http://www.videolan.org/ is a good start for
-information about MPEG and DVD playing. Have a look at the documentation
-section, as well as the bookmarks.
-
-You can also try the OpenDVD site at http://www.opendvd.org/ or the
-the LiViD project at http://www.linuxvideo.org/. They have lots of
-information, too.
-
-
-The team
-========
-
-See the AUTHORS file for a list of the vlc authors and contributors.
-
-The following teachers were involved in the VideoLAN project :
-
-  Pierre Lecoy, teacher-cum-researcher at ECP,
-  Philippe Boutin, head of the LMI (MicroComputing Laboratory).
-
-The following students were members of the VideoLAN team :
-
-1996-1997:
-  Pierre Almeras <almeras@via.ecp.fr>
-  Christophe Arnaud <christophe.arnaud@tps.fr>
-  Antoine Brenner <brenner@via.ecp.fr>
-  Rgis Duchesne <regis@via.ecp.fr>
-  Alexandre Francois <francois@via.ecp.fr>
-  Christian Gross <gross@via.ecp.fr>
-  Hugo Haas <hugo@via.ecp.fr>
-  Mikael Journo <mj32@cornell.edu>
-  Michel Lespinasse <walken@zoy.org>
-  Christophe Ulses <mowgli@laotseu.via.ecp.fr>
-  Pierre Vandecasteele <pabv2@hermes.cam.ac.uk>
-  Guillaume Vergnaud <vergnaud@via.ecp.fr>
-
-1997-1998:
-  Olivier Baxa <oli@via.ecp.fr>
-  Patrice Bazerque <patrice.bazerque@via.ecp.fr>
-  Arnaud Bienvenu <arnaud.bienvenu@via.ecp.fr>
-  Rgis Clment <clement@via.ecp.fr>
-  Alexandre Duret <alex@via.ecp.fr>
-  Eric Estievenart <eric@via.ecp.fr>
-  Sbastien Kurz <seb@tao.via.ecp.fr>
-  Olivier Pomel <pomel@via.ecp.fr>
-
-1998-1999:
-  Pierre Baillet <octplane@via.ecp.fr>
-  Alban Fonrouge <alban@via.ecp.fr>
-  Jean-Philippe Grimaldi <jeanphi@via.ecp.fr>
-  Andres Krapf <dae@via.ecp.fr>
-  Christophe Massiot <massiot@via.ecp.fr>
-  Mathieu Poumeyrol <kaliban@via.ecp.fr>
-  Etienne Roy <etienne@via.ecp.fr>
-  Vincent Seguin <seguin@via.ecp.fr>
-  Benoit Steiner <benny@via.ecp.fr>
-
-1999-2000:
-  Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
-  Jean-Marc Dressler <polux@via.ecp.fr>
-  Gal Hendryckx <jimmy@via.ecp.fr>
-  Samuel Hocevar <sam@zoy.org>
-  Brieuc Jeunhomme <bbp@via.ecp.fr>
-  Michel Kaempf <maxx@via.ecp.fr>
-  Florent Rougon <flo@via.ecp.fr>
-
-2000-2001:
-  Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
-  Stphane Borel <stef@via.ecp.fr>
-  Renaud Dartus <reno@via.ecp.fr>
-  Henri Fallon <henri@via.ecp.fr>
-  Jean-Michel Grimaldi <jm@via.ecp.fr>
-  Samuel Hocevar <sam@zoy.org>
-  Damien Lucas <nitrox@via.ecp.fr>
-  Rmi Peyronnet <remi@via.ecp.fr>
-  Laurent Rossier <gunther@via.ecp.fr>
+The VideoLAN web site : http://www.videolan.org/
+Mailing-lists : http://www.videolan.org/lists.html
 

debian/.cvsignore

 tmp
 vlc
-vlc-*
+vlc-plugin-*
 mozilla-plugin-vlc
+gvlc*
+gnome-vlc*
+qvlc*
+kvlc*
 delete
 files
 *debhelper

debian/control

@@ -16,9 +16,11 @@ Description: a free MPEG, DVD and DivX player
  This is vlc, the VideoLAN Client. It plays MPEG and MPEG2 files,
  DVDs, or MPEG streams from a network source.
 
-Package: vlc-gnome
+Package: gnome-vlc
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
+Conflicts: vlc-gnome (<< 0.5.0)
+Replaces: vlc-gnome (<< 0.5.0)
 Provides: vlc-gui
 Description: GNOME interface plugin for vlc
  VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
@@ -26,11 +28,11 @@ Description: GNOME interface plugin for vlc
  This plugin adds a Gnome interface to vlc, the VideoLAN Client. To
  activate it, use the `--intf gnome' flag or run the `gnome-vlc' program.
 
-Package: vlc-gtk
+Package: gvlc
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
-Replaces: vlc-gnome (<= 0.2.63-2)
-Conflicts: vlc-gnome (<= 0.2.63-2)
+Conflicts: vlc-gnome (<= 0.2.63-2), vlc-gtk (<< 0.5.0)
+Replaces: vlc-gnome (<= 0.2.63-2), vlc-gtk (<< 0.5.0)
 Provides: vlc-gui
 Description: Gtk+ interface plugin for vlc
  VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
@@ -38,9 +40,11 @@ Description: Gtk+ interface plugin for vlc
  This plugin adds a Gtk+ interface to vlc, the VideoLAN Client. To
  activate it, use the `--intf gtk' flag or run the `gvlc' program.
 
-Package: vlc-esd
+Package: vlc-plugin-esd
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
+Conflicts: vlc-esd (<< 0.5.0)
+Replaces: vlc-esd (<< 0.5.0)
 Description: Esound audio output plugin for vlc
  VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
  .
@@ -48,9 +52,11 @@ Description: Esound audio output plugin for vlc
  VideoLAN Client. To activate it, use the `--aout esd' flag or select
  the `esd' aout plugin from the preferences menu.
 
-Package: vlc-alsa
+Package: vlc-plugin-alsa
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
+Conflicts: vlc-alsa (<< 0.5.0)
+Replaces: vlc-alsa (<< 0.5.0)
 Description: ALSA audio output plugin for vlc
  VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
  .
@@ -58,9 +64,11 @@ Description: ALSA audio output plugin for vlc
  vlc, the VideoLAN Client. To activate it, use the `--aout alsa' flag or
  select the `alsa' aout plugin from the preferences menu.
 
-Package: vlc-sdl
+Package: vlc-plugin-sdl
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
+Conflicts: vlc-sdl (<< 0.5.0)
+Replaces: vlc-sdl (<< 0.5.0)
 Description: SDL video and audio output plugin for vlc
  VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
  .
@@ -69,9 +77,11 @@ Description: SDL video and audio output plugin for vlc
  `--aout sdl' flags or select the `sdl' vout or aout plugin from the
  preferences menu.
 
-Package: vlc-ggi
+Package: vlc-plugin-ggi
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
+Conflicts: vlc-ggi (<< 0.5.0)
+Replaces: vlc-ggi (<< 0.5.0)
 Description: GGI video output plugin for vlc
  VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
  .
@@ -79,9 +89,11 @@ Description: GGI video output plugin for vlc
  the `--vout ggi' flag or select the `ggi' vout plugin from the preferences
  menu.
 
-Package: vlc-glide
+Package: vlc-plugin-glide
 Architecture: i386
 Depends: vlc (= ${Source-Version}), libglide2
+Conflicts: vlc-glide (<< 0.5.0)
+Replaces: vlc-glide (<< 0.5.0)
 Description: Glide video output plugin for vlc
  VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
  .
@@ -89,9 +101,11 @@ Description: Glide video output plugin for vlc
  it, use the `--vout glide' flag or select the `glide' vout plugin from
  the preferences menu.
 
-Package: vlc-qt
+Package: qvlc
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
+Conflicts: vlc-qt (<< 0.5.0)
+Replaces: vlc-qt (<< 0.5.0)
 Provides: vlc-gui
 Description: Qt interface plugin for vlc
  VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
@@ -99,9 +113,11 @@ Description: Qt interface plugin for vlc
  This plugin adds a Qt interface to vlc, the VideoLAN Client. To
  activate it, use the `--intf qt' flag or run the `qvlc' program.
 
-Package: vlc-mad
+Package: vlc-plugin-mad
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
+Conflicts: vlc-mad (<< 0.5.0)
+Replaces: vlc-mad (<< 0.5.0)
 Description: MAD audio codec plugin for vlc
  VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
  .
@@ -110,9 +126,11 @@ Description: MAD audio codec plugin for vlc
  this plugin, use the `--mpeg_adec mad' flag or select the `mad' MPEG
  decoder from the preferences menu.
 
-Package: vlc-arts
+Package: vlc-plugin-arts
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
+Conflicts: vlc-arts (<< 0.5.0)
+Replaces: vlc-arts (<< 0.5.0)
 Description: aRts audio output plugin for vlc
  VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
  .
@@ -120,18 +138,22 @@ Description: aRts audio output plugin for vlc
  VideoLAN Client. To activate it, use the `--aout arts' flag or
  select the `arts' aout plugin from the preferences menu.
 
-Package: vlc-lirc
+Package: vlc-plugin-lirc
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
+Conflicts: vlc-lirc (<< 0.5.0)
+Replaces: vlc-lirc (<< 0.5.0)
 Description: lirc (infrared remote control) interface plugin for vlc
  VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
  .
  This plugin is an infrared lirc interface for vlc, the
  VideoLAN Client. To activate it, use the `--intf lirc' flag.
 
-Package: vlc-aa
+Package: vlc-plugin-aa
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
+Conflicts: vlc-aa (<< 0.5.0)
+Replaces: vlc-aa (<< 0.5.0)
 Description: ASCII art video output plugin for vlc
  VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
  .
@@ -139,9 +161,11 @@ Description: ASCII art video output plugin for vlc
  Client. To activate it, use the `--vout aa' flag or select the `aa'
  vout plugin from the preferences menu.
 
-Package: vlc-xosd
+Package: vlc-plugin-xosd
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
+Conflicts: vlc-xosd (<< 0.5.0)
+Replaces: vlc-xosd (<< 0.5.0)
 Description: X On-Screen Display plugin for vlc
  VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
  .
@@ -160,9 +184,11 @@ Description: a multimedia plugin for Mozilla, based on vlc
  embedded in a webpage or directly in the browser window. There is also
  support for fullscreen display.
 
-Package: vlc-kde
+Package: kvlc
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
+Conflicts: vlc-kde (<< 0.5.0)
+Replaces: vlc-kde (<< 0.5.0)
 Provides: vlc-gui
 Description: KDE interface plugin for vlc
  VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.

debian/vlc-gnome.menu → debian/gnome-vlc.menu

-?package(vlc-gnome):command="/usr/bin/gnome-vlc" hotkey="V" needs="X11" \
+?package(gnome-vlc):command="/usr/bin/gnome-vlc" hotkey="V" needs="X11" \
                     section="Apps/Viewers" title="Gnome VideoLAN Client" \
                     icon="/usr/share/vlc/gnome-vlc.xpm" hints="Video"

debian/gvlc.menu

+?package(gvlc):command="/usr/bin/gvlc" hotkey="V" needs="X11" \
+               section="Apps/Viewers" title="Gtk+ VideoLAN Client" \
+               icon="/usr/share/vlc/gvlc.xpm" hints="Video"

debian/kvlc.menu

+?package(kvlc):command="/usr/bin/kvlc" hotkey="V" needs="X11" \
+               section="Apps/Viewers" title="KDE VideoLAN Client" \
+               icon="/usr/share/vlc/kvlc.xpm" hints="Video"

debian/qvlc.menu

+?package(qvlc):command="/usr/bin/qvlc" hotkey="V" needs="X11" \
+               section="Apps/Viewers" title="Qt VideoLAN Client" \
+               icon="/usr/share/vlc/qvlc.xpm" hints="Video"

debian/rules

@@ -32,9 +32,10 @@ build-stamp:
 	*) \
 		ARCH_FLAGS="" ;; \
 	esac ;\
-	./configure $$ARCH_FLAGS --mandir=$${prefix}/share/man \
+	./configure --mandir=$${prefix}/share/man \
 		--infodir=$${prefix}/share/info \
-		$(shell echo $(CONFIG_FLAGS)) $(shell echo $(DVDCSS_FLAGS))
+		$(shell echo $(CONFIG_FLAGS)) $$ARCH_FLAGS \
+		$(shell echo $(DVDCSS_FLAGS))
 
 	$(MAKE)
 
@@ -68,39 +69,52 @@ install: build
 		ARCH_ALIASES="ggi gtk gnome esd sdl qt arts mad alsa lirc aa xosd kde" ;; \
 	esac ;\
 	for alias in $$ARCH_ALIASES ; do \
-		ln -s vlc debian/vlc-$$alias/usr/share/doc/vlc-$$alias ; \
+		ln -s vlc debian/vlc-plugin-$$alias/usr/share/doc/vlc-plugin-$$alias ; \
 		mv debian/vlc/usr/lib/vlc/$$alias.so \
-			debian/vlc-$$alias/usr/lib/vlc/ ; done
+			debian/vlc-plugin-$$alias/usr/lib/vlc/ ; done
 
 	# do the same for the mozilla plugin
 	ln -s vlc debian/mozilla-plugin-vlc/usr/share/doc/mozilla-plugin-vlc
 	mv debian/vlc/usr/lib/mozilla debian/mozilla-plugin-vlc/usr/lib
 
-	# move binary aliases
-	mv debian/vlc/usr/bin/gvlc debian/vlc-gtk/usr/bin/
-	mv debian/vlc/usr/bin/gnome-vlc debian/vlc-gnome/usr/bin/
-	mv debian/vlc/usr/bin/qvlc debian/vlc-qt/usr/bin/
-	mv debian/vlc/usr/bin/kvlc debian/vlc-kde/usr/bin/
+	# do the binary aliases
+	mv debian/vlc/usr/bin/gvlc debian/gvlc/usr/bin/
+	ln -s vlc debian/gvlc/usr/share/doc/gvlc
+	mv debian/vlc/usr/lib/vlc/gtk.so debian/gvlc/usr/lib/vlc/
+	ln -s vlc.1.gz debian/gvlc/usr/share/man/man1/gvlc.1.gz
 
+	mv debian/vlc/usr/bin/gnome-vlc debian/gnome-vlc/usr/bin/
+	ln -s vlc debian/gnome-vlc/usr/share/doc/gnome-vlc
+	mv debian/vlc/usr/lib/vlc/gnome.so debian/gnome-vlc/usr/lib/vlc/
+	ln -s vlc.1.gz debian/gnome-vlc/usr/share/man/man1/gnome-vlc.1.gz
+
+	mv debian/vlc/usr/bin/qvlc debian/qvlc/usr/bin/
+	ln -s vlc debian/qvlc/usr/share/doc/qvlc
+	mv debian/vlc/usr/lib/vlc/qt.so debian/qvlc/usr/lib/vlc/
+	ln -s vlc.1.gz debian/qvlc/usr/share/man/man1/qvlc.1.gz
+
+	mv debian/vlc/usr/bin/kvlc debian/kvlc/usr/bin/
+	ln -s vlc debian/kvlc/usr/share/doc/kvlc
+	mv debian/vlc/usr/lib/vlc/kde.so debian/kvlc/usr/lib/vlc/
+	ln -s vlc.1.gz debian/kvlc/usr/share/man/man1/kvlc.1.gz
+
+	# copy pictures
 	mv debian/vlc/$(VIDDIR)/vlc48x48.png debian/vlc/$(PIXDIR)/vlc.png
-	mv debian/vlc/$(VIDDIR)/gvlc32x32.xpm debian/vlc-gtk/$(VIDDIR)/gvlc.xpm
-	mv debian/vlc/$(VIDDIR)/gvlc48x48.png debian/vlc-gtk/$(PIXDIR)/gvlc.png
-	mv debian/vlc/$(VIDDIR)/gnome-vlc32x32.xpm debian/vlc-gnome/$(VIDDIR)/gnome-vlc.xpm
-	mv debian/vlc/$(VIDDIR)/gnome-vlc48x48.png debian/vlc-gnome/$(PIXDIR)/gnome-vlc.png
-	mv debian/vlc/$(VIDDIR)/qvlc32x32.xpm debian/vlc-qt/$(VIDDIR)/qvlc.xpm
-	mv debian/vlc/$(VIDDIR)/qvlc48x48.png debian/vlc-qt/$(PIXDIR)/qvlc.png
-	mv debian/vlc/$(VIDDIR)/kvlc32x32.xpm debian/vlc-kde/$(VIDDIR)/kvlc.xpm
-	mv debian/vlc/$(VIDDIR)/kvlc48x48.png debian/vlc-kde/$(PIXDIR)/kvlc.png
+	mv debian/vlc/$(VIDDIR)/gvlc32x32.xpm debian/gvlc/$(VIDDIR)/gvlc.xpm
+	mv debian/vlc/$(VIDDIR)/gvlc48x48.png debian/gvlc/$(PIXDIR)/gvlc.png
+	mv debian/vlc/$(VIDDIR)/gnome-vlc32x32.xpm debian/gnome-vlc/$(VIDDIR)/gnome-vlc.xpm
+	mv debian/vlc/$(VIDDIR)/gnome-vlc48x48.png debian/gnome-vlc/$(PIXDIR)/gnome-vlc.png
+	mv debian/vlc/$(VIDDIR)/qvlc32x32.xpm debian/qvlc/$(VIDDIR)/qvlc.xpm
+	mv debian/vlc/$(VIDDIR)/qvlc48x48.png debian/qvlc/$(PIXDIR)/qvlc.png
+	mv debian/vlc/$(VIDDIR)/kvlc32x32.xpm debian/kvlc/$(VIDDIR)/kvlc.xpm
+	mv debian/vlc/$(VIDDIR)/kvlc48x48.png debian/kvlc/$(PIXDIR)/kvlc.png
+	rm -f debian/vlc/$(VIDDIR)/*.png
 
 	cp debian/vlc.desktop debian/vlc/$(GNOMEDIR)
-	cp debian/gvlc.desktop debian/vlc-gtk/$(GNOMEDIR)
-	cp debian/gnome-vlc.desktop debian/vlc-gnome/$(GNOMEDIR)
+	cp debian/gvlc.desktop debian/gvlc/$(GNOMEDIR)
+	cp debian/gnome-vlc.desktop debian/gnome-vlc/$(GNOMEDIR)
 
 	#gzip -9 < doc/vlc.1 >| debian/vlc/usr/share/man/man1/vlc.1.gz
-	ln -s vlc.1.gz debian/vlc-gtk/usr/share/man/man1/gvlc.1.gz
-	ln -s vlc.1.gz debian/vlc-gnome/usr/share/man/man1/gnome-vlc.1.gz
-	ln -s vlc.1.gz debian/vlc-qt/usr/share/man/man1/qvlc.1.gz
-	ln -s vlc.1.gz debian/vlc-kde/usr/share/man/man1/kvlc.1.gz
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -122,7 +136,7 @@ binary-arch: build install
 	dh_installman doc/vlc.1
 #	dh_installinfo
 #	dh_undocumented
-	dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt -Nvlc-arts -Nvlc-mad -Nvlc-lirc -Nvlc-aa -Nvlc-xosd -Nvlc-kde -Nmozilla-plugin-vlc ChangeLog
+	dh_installchangelogs -Ngnome-vlc -Ngvlc -Nvlc-plugin-ggi -Nvlc-plugin-glide -Nvlc-plugin-esd -Nvlc-plugin-alsa -Nvlc-plugin-sdl -Nqvlc -Nvlc-plugin-arts -Nvlc-plugin-mad -Nvlc-plugin-lirc -Nvlc-plugin-aa -Nvlc-plugin-xosd -Nkvlc -Nmozilla-plugin-vlc ChangeLog
 	dh_link
 	dh_strip
 	dh_compress
@@ -135,7 +149,7 @@ binary-arch: build install
 	i386) \
 		ARCH_EXCLUDE="" ;; \
 	*) \
-		ARCH_EXCLUDE="-Nvlc-glide" ;; \
+		ARCH_EXCLUDE="-Nvlc-plugin-glide" ;; \
 	esac ;\
 	dh_shlibdeps $$ARCH_EXCLUDE ;\
 	dh_gencontrol $$ARCH_EXCLUDE ;\

debian/vlc-gtk.menu

-?package(vlc-gtk):command="/usr/bin/gvlc" hotkey="V" needs="X11" \
-                  section="Apps/Viewers" title="Gtk+ VideoLAN Client" \
-                  icon="/usr/share/vlc/gvlc.xpm" hints="Video"

debian/vlc-kde.menu

-?package(vlc-kde):command="/usr/bin/kvlc" hotkey="V" needs="X11" \
-                 section="Apps/Viewers" title="KDE VideoLAN Client" \
-                 icon="/usr/share/vlc/kvlc.xpm" hints="Video"

debian/vlc-plugin-xosd.dirs

+usr/lib/vlc
+usr/share/doc

debian/vlc-qt.menu

-?package(vlc-qt):command="/usr/bin/qvlc" hotkey="V" needs="X11" \
-                 section="Apps/Viewers" title="Qt VideoLAN Client" \
-                 icon="/usr/share/vlc/qvlc.xpm" hints="Video"

debian/vlc.menu

 ?package(vlc):command="/usr/bin/vlc" hotkey="V" needs="X11" \
-               section="Apps/Viewers" title="VideoLAN Client" \
-               icon="/usr/share/vlc/vlc.xpm" hints="Video"
+              section="Apps/Viewers" title="VideoLAN Client" \
+              icon="/usr/share/vlc/vlc.xpm" hints="Video"