* ./debian/*: activated the wxwindows plugin.

debian/.cvsignore

@@ -8,6 +8,7 @@ gvlc
 gnome-vlc
 qvlc
 kvlc
+wxvlc
 delete
 files
 *debhelper

debian/Makefile.am

-EXTRA_DIST = changelog control rules \
-             vlc.copyright vlc.desktop vlc.dirs vlc.docs vlc.menu \
-             gnome-vlc.desktop gnome-vlc.dirs gnome-vlc.menu \
-             gvlc.desktop gvlc.dirs gvlc.menu \
-             kvlc.dirs kvlc.menu \
-             libvlc0-dev.dirs \
-             mozilla-plugin-vlc.dirs \
-             qvlc.dirs qvlc.menu \
-             vlc-plugin-a52.dirs \
-             vlc-plugin-aa.dirs \
-             vlc-plugin-alsa.dirs \
-             vlc-plugin-arts.dirs \
-             vlc-plugin-dv.dirs \
-             vlc-plugin-dvb.dirs \
-             vlc-plugin-esd.dirs \
-             vlc-plugin-ggi.dirs \
-             vlc-plugin-glide.dirs \
-             vlc-plugin-lirc.dirs \
-             vlc-plugin-mad.dirs \
-             vlc-plugin-sdl.dirs \
-             vlc-plugin-svgalib.dirs \
-             vlc-plugin-xosd.dirs
+NULL =
+
+EXTRA_DIST = \
+	changelog \
+	control \
+	rules \
+	vlc.copyright \
+	vlc.desktop \
+	vlc.dirs \
+	vlc.docs \
+	vlc.menu \
+	gnome-vlc.desktop \
+	gnome-vlc.dirs \
+	gnome-vlc.menu \
+	gvlc.desktop \
+	gvlc.dirs \
+	gvlc.menu \
+	kvlc.dirs \
+	kvlc.menu \
+	libvlc0-dev.dirs \
+	mozilla-plugin-vlc.dirs \
+	qvlc.dirs \
+	qvlc.menu \
+	vlc-plugin-a52.dirs \
+	vlc-plugin-aa.dirs \
+	vlc-plugin-alsa.dirs \
+	vlc-plugin-arts.dirs \
+	vlc-plugin-dv.dirs \
+	vlc-plugin-dvb.dirs \
+	vlc-plugin-esd.dirs \
+	vlc-plugin-ggi.dirs \
+	vlc-plugin-glide.dirs \
+	vlc-plugin-lirc.dirs \
+	vlc-plugin-mad.dirs \
+	vlc-plugin-ogg.dirs \
+	vlc-plugin-sdl.dirs \
+	vlc-plugin-svgalib.dirs \
+	vlc-plugin-xosd.dirs \
+	wxvlc.dirs \
+	wxvlc.menu \
+	$(NULL)

debian/control

@@ -2,7 +2,7 @@ Source: vlc
 Section: graphics
 Priority: optional
 Maintainer: Samuel Hocevar <sam@zoy.org>
-Build-Depends: debhelper (>=2.2.0), xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>=1.2.2-3.1), libqt-dev, libasound2-dev (>=0.9.0beta10a), libarts-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi1-dev, mozilla-dev, kdelibs-dev, dvb-dev, libdv2-dev, libxosd-dev, svgalibg1-dev (>=1.4.0), libogg-dev, libvorbis-dev
+Build-Depends: debhelper (>=2.2.0), xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>=1.2.2-3.1), libqt-dev, libasound2-dev (>=0.9.0beta10a), libarts-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi1-dev, mozilla-dev, kdelibs-dev, dvb-dev, libdv2-dev, libxosd-dev, svgalibg1-dev (>=1.4.0), libogg-dev, libvorbis-dev, libwxgtk2.4-dev
 Standards-Version: 3.5.6
 
 Package: vlc
@@ -327,3 +327,13 @@ Description: Ogg demuxer and Vorbis codec plugins for vlc
  These plugins add support for the Ogg bitstream format and the Ogg Vorbis
  compressed audio format to vlc, the VideoLAN Client. They are autodetected.
 
+Package: wxvlc
+Architecture: any
+Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
+Provides: vlc-gui
+Description: wxWindows frontend for vlc
+ VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
+ .
+ This plugin adds a wxWindow interface to vlc, the VideoLAN Client. To
+ activate it, use the `--intf wxwin' flag or run the `wxvlc' program.
+

debian/rules

@@ -39,6 +39,7 @@ CONFIG_FLAGS += \
 	--enable-satellite \
 	--enable-ogg \
 	--enable-vorbis \
+	--enable-wxwindows \
 	$(NULL)
 
 # These ones are currently shipped with VLC
@@ -55,6 +56,7 @@ endif
 # Remove --without-dvdcss in non-totalitarian countries
 CONFIG_FLAGS += --enable-dvd --without-dvdcss
 
+# A few shortcuts
 VIDDIR = usr/share/vlc
 PIXDIR = usr/share/pixmaps
 GNOMEDIR = usr/share/gnome/apps/Multimedia
@@ -69,11 +71,11 @@ build-stamp:
 
 	# Check that we have an ffmpeg tree in here (can be a symlink)
 	test -d extras/ffmpeg
-	if test "$(PRESERVE_EXTRAS)" = ""; then cd extras/ffmpeg && ./configure && make; fi
+	if test ! -d CVS; then cd extras/ffmpeg && ./configure && make; fi
 
 	# Check that we have an faad tree in here (can be a symlink)
 	test -d extras/faad
-	if test "$(PRESERVE_EXTRAS)" = ""; then cd extras/faad && ./configure --disable-shared && cd libfaad && make; fi
+	if test ! -d CVS; then cd extras/faad && ./configure --disable-shared && cd libfaad && make; fi
 
 	# Configure VLC and build it
 	./configure --mandir=$${prefix}/share/man \
@@ -89,10 +91,10 @@ clean:
 
 	# Check that we have an ffmpeg tree in here (can be a symlink)
 	test -d extras/ffmpeg
-	-if test "$(PRESERVE_EXTRAS)" = ""; then cd extras/ffmpeg && make distclean; fi
+	-if test ! -d CVS; then cd extras/ffmpeg && make distclean; fi
 	# Check that we have an faad tree in here (can be a symlink)
 	test -d extras/faad
-	-if test "$(PRESERVE_EXTRAS)" = ""; then cd extras/faad && make distclean; fi
+	-if test ! -d CVS; then cd extras/faad && make distclean; fi
 
 	-$(MAKE) distclean
 
@@ -184,8 +186,8 @@ endif
 
 	# Package: vlc-plugin-mad
 	ln -s vlc debian/vlc-plugin-mad/usr/share/doc/vlc-plugin-mad
-	mv debian/vlc/usr/lib/vlc/codec/libmad_plugin.so \
-		debian/vlc-plugin-mad/usr/lib/vlc/codec/
+	mv debian/vlc/usr/lib/vlc/audio_filter/libmpgatofixed32_plugin.so \
+		debian/vlc-plugin-mad/usr/lib/vlc/audio_filter/
 
 	# Package: vlc-plugin-arts
 	ln -s vlc debian/vlc-plugin-arts/usr/share/doc/vlc-plugin-arts
@@ -234,8 +236,8 @@ endif
 
 	# Package: vlc-plugin-a52
 	ln -s vlc debian/vlc-plugin-a52/usr/share/doc/vlc-plugin-a52
-	mv debian/vlc/usr/lib/vlc/codec/liba52_plugin.so \
-		debian/vlc-plugin-a52/usr/lib/vlc/codec
+	mv debian/vlc/usr/lib/vlc/audio_filter/liba52tofloat32_plugin.so \
+		debian/vlc-plugin-a52/usr/lib/vlc/audio_filter
 
 	# Package: vlc-plugin-dvb
 	ln -s vlc debian/vlc-plugin-dvb/usr/share/doc/vlc-plugin-dvb
@@ -249,6 +251,13 @@ endif
 	mv debian/vlc/usr/lib/vlc/codec/libvorbis_plugin.so \
 		debian/vlc-plugin-ogg/usr/lib/vlc/codec
 
+	# Package: wxvlc
+	mv debian/vlc/usr/bin/wxvlc debian/wxvlc/usr/bin/
+	ln -s vlc debian/wxvlc/usr/share/doc/wxvlc
+	mv debian/vlc/usr/lib/vlc/gui/libwxwindows_plugin.so \
+		debian/wxvlc/usr/lib/vlc/gui/
+	ln -s vlc.1.gz debian/wxvlc/usr/share/man/man1/wxvlc.1.gz
+
 	# Clean up
 	rm -f debian/vlc/$(VIDDIR)/*.png
 

debian/vlc-plugin-a52.dirs

-usr/lib/vlc/codec
+usr/lib/vlc/audio_filter
 usr/share/doc

debian/vlc-plugin-mad.dirs

-usr/lib/vlc/codec
+usr/lib/vlc/audio_filter
 usr/share/doc

debian/wxvlc.dirs

+usr/bin
+usr/lib/vlc/gui
+usr/share/doc
+usr/share/man/man1
+usr/share/pixmaps
+usr/share/vlc

debian/wxvlc.menu

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