* ./debian/*: removed the vlc-plugin-dvb, vlc-plugin-xosd and vlc-plugin-dv

    packages (because the dependencies are very small), and the vlc-plugin-mad,
    vlc-plugin-a52 and vlc-plugin-ogg packages (because vlc depends on them
    anyway).
  * ./debian/*: changed vlc-plugin-svgalib to x86-only.

debian/Makefile.am

@@ -21,21 +21,15 @@ EXTRA_DIST = \
 	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 \
 	woody-buildpackage \
 	wxvlc.dirs \
 	wxvlc.menu \

debian/control

@@ -2,7 +2,7 @@ Source: vlc
 Section: graphics
 Priority: optional
 Maintainer: Samuel Hocevar <sam@zoy.org>
-Build-Depends: debhelper (>=2.2.0), gettext, fortune-mod, xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>=1.2.2-3.1), libqt3-dev, libasound2-dev (>=0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi1-dev, mozilla-dev, kdelibs4-dev, dvb-dev, libdv2-dev, libxosd-dev, svgalibg1-dev (>=1.4.0), libogg-dev, libvorbis-dev, libwxgtk2.4-dev, libdvdplay0-dev, libdvdread2-dev, libslp-dev, libflac-dev (>=1.1.0)
+Build-Depends: debhelper (>=2.2.0), gettext, fortune-mod, xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>=1.2.2-3.1), libqt3-dev, libasound2-dev (>=0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi1-dev, mozilla-dev, kdelibs4-dev, dvb-dev, libdv2-dev, libxosd-dev, svgalibg1-dev (>=1.4.0) [i386], libogg-dev, libvorbis-dev, libwxgtk2.4-dev, libdvdplay0-dev, libdvdread2-dev, libslp-dev, libflac-dev (>=1.1.0)
 Standards-Version: 3.5.6
 
 Package: vlc
@@ -10,7 +10,6 @@ Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: vlc-gui
-Depends: vlc-plugin-mad, vlc-plugin-a52
 Suggests: gnome-vlc
 Description: a complete multimedia player
  This is the VideoLAN project's VLC media player. It plays MPEG, MPEG2,
@@ -156,22 +155,11 @@ Depends: qvlc
 Description: legacy package that you should remove
  This package is now called qvlc.
 
-Package: vlc-plugin-mad
-Architecture: any
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
-Conflicts: vlc-mad (<< 0.5.0)
-Replaces: vlc-mad (<< 0.5.0)
-Provides: mp3-decoder
-Description: MPEG audio codec plugin for VLC
- This plugin adds support for libmad, the MPEG audio decoder library,
- to the VLC media player. It is based on libmad, a 100% fixed-point based
- decoding library. The plugin is autodetected.
-
 Package: vlc-mad
 Architecture: any
-Depends: vlc-plugin-mad
+Depends: vlc
 Description: legacy package that you should remove
- This package is now called vlc-plugin-mad.
+ This package is now included in vlc.
 
 Package: vlc-plugin-arts
 Architecture: any
@@ -221,16 +209,6 @@ Depends: vlc-plugin-aa
 Description: legacy package that you should remove
  This package is now called vlc-plugin-aa.
 
-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
- This is an On-Screen Display plugin for the VLC media player. To
- activate it, use the `--extraintf xosd' flag or select the `xosd'
- extra interface plugin from the preferences menu.
-
 Package: mozilla-plugin-vlc
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
@@ -253,7 +231,7 @@ Description: KDE frontend for VLC
  use the `--intf kde' flag or run the `kvlc' program.
 
 Package: vlc-plugin-svgalib
-Architecture: any
+Architecture: i386
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
 Description: SVGAlib video output plugin for VLC
  This plugin adds support for SVGAlib to the VLC media player. To
@@ -261,34 +239,6 @@ Description: SVGAlib video output plugin for VLC
  output plugin from the preferences menu. Note that you will need root
  permissions to use SVGAlib.
 
-Package: vlc-plugin-dv
-Architecture: any
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
-Description: DV video codec plugin for VLC
- This plugin adds support for the DV video format to the VLC media player.
- The plugin is autodetected.
-
-Package: vlc-plugin-a52
-Architecture: any
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
-Description: A-52 (AC-3) audio codec plugin for VLC
- This plugin adds support for the ATSC A-52 (aka. AC-3) audio format to
- the VLC media player. The plugin is autodetected.
-
-Package: vlc-plugin-dvb
-Architecture: any
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
-Description: DVB input plugin for VLC
- This plugin adds support for DVB cards to the VLC media player. Note
- that your card needs to be supported by your kernel before VLC can use it.
-
-Package: vlc-plugin-ogg
-Architecture: any
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
-Description: Ogg demuxer and Vorbis audio codec plugins for VLC
- These plugins add support for the Ogg bitstream format and the Ogg Vorbis
- compressed audio format to the VLC media player. They are autodetected.
-
 Package: wxvlc
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}

debian/rules

@@ -37,7 +37,6 @@ CONFIG_FLAGS += \
 	--enable-mp4 \
 	--enable-dvb \
 	--enable-dv \
-	--enable-svgalib \
 	--enable-satellite \
 	--enable-ogg \
 	--enable-vorbis \
@@ -53,8 +52,10 @@ CONFIG_FLAGS += --enable-faad --with-faad-tree=extras/faad
 # Glide is only for x86
 ifeq ($(DEB_BUILD_ARCH),i386)
 CONFIG_FLAGS += --enable-glide
+CONFIG_FLAGS += --enable-svgalib
 else
 ARCH_EXCLUDE += -Nvlc-plugin-glide -Nvlc-glide
+ARCH_EXCLUDE += -Nvlc-plugin-svgalib
 endif
 
 # Remove --without-dvdcss in non-totalitarian countries
@@ -162,6 +163,7 @@ install: build
 	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
 
+	# Package: vlc-gnome
 	mkdir -p debian/vlc-gnome/usr/share/doc/
 	ln -s vlc debian/vlc-gnome/usr/share/doc/vlc-gnome
 
@@ -178,6 +180,7 @@ install: build
 	mv debian/vlc/$(VIDDIR)/gvlc32x32.xpm debian/gvlc/$(VIDDIR)/gvlc.xpm
 	mv debian/vlc/$(VIDDIR)/gvlc48x48.png debian/gvlc/$(PIXDIR)/gvlc.png
 
+	# Package: vlc-gtk
 	mkdir -p debian/vlc-gtk/usr/share/doc/
 	ln -s vlc debian/vlc-gtk/usr/share/doc/vlc-gtk
 
@@ -186,6 +189,7 @@ install: build
 	mv debian/vlc/usr/lib/vlc/audio_output/libesd_plugin.so \
 		debian/vlc-plugin-esd/usr/lib/vlc/audio_output/
 
+	# Package: vlc-esd
 	mkdir -p debian/vlc-esd/usr/share/doc/
 	ln -s vlc debian/vlc-esd/usr/share/doc/vlc-esd
 
@@ -194,6 +198,7 @@ install: build
 	mv debian/vlc/usr/lib/vlc/audio_output/libalsa_plugin.so \
 		debian/vlc-plugin-alsa/usr/lib/vlc/audio_output/
 
+	# Package: vlc-alsa
 	mkdir -p debian/vlc-alsa/usr/share/doc/
 	ln -s vlc debian/vlc-alsa/usr/share/doc/vlc-alsa
 
@@ -204,6 +209,7 @@ install: build
 	mv debian/vlc/usr/lib/vlc/video_output/libvout_sdl_plugin.so \
 		debian/vlc-plugin-sdl/usr/lib/vlc/video_output/
 
+	# Package: vlc-sdl
 	mkdir -p debian/vlc-sdl/usr/share/doc/
 	ln -s vlc debian/vlc-sdl/usr/share/doc/vlc-sdl
 
@@ -212,6 +218,7 @@ install: build
 	mv debian/vlc/usr/lib/vlc/video_output/libggi_plugin.so \
 		debian/vlc-plugin-ggi/usr/lib/vlc/video_output/
 
+	# Package: vlc-ggi
 	mkdir -p debian/vlc-ggi/usr/share/doc/
 	ln -s vlc debian/vlc-ggi/usr/share/doc/vlc-ggi
 
@@ -221,6 +228,7 @@ ifeq ($(DEB_BUILD_ARCH),i386)
 	mv debian/vlc/usr/lib/vlc/video_output/libglide_plugin.so \
 		debian/vlc-plugin-glide/usr/lib/vlc/video_output/
 
+	# Package: vlc-glide
 	mkdir -p debian/vlc-glide/usr/share/doc/
 	ln -s vlc debian/vlc-glide/usr/share/doc/vlc-glide
 endif
@@ -234,14 +242,11 @@ endif
 	mv debian/vlc/$(VIDDIR)/qvlc32x32.xpm debian/qvlc/$(VIDDIR)/qvlc.xpm
 	mv debian/vlc/$(VIDDIR)/qvlc48x48.png debian/qvlc/$(PIXDIR)/qvlc.png
 
+	# Package: vlc-qt
 	mkdir -p debian/vlc-qt/usr/share/doc/
 	ln -s vlc debian/vlc-qt/usr/share/doc/vlc-qt
 
-	# Package: vlc-plugin-mad
-	ln -s vlc debian/vlc-plugin-mad/usr/share/doc/vlc-plugin-mad
-	mv debian/vlc/usr/lib/vlc/audio_filter/libmpgatofixed32_plugin.so \
-		debian/vlc-plugin-mad/usr/lib/vlc/audio_filter/
-
+	# Package: vlc-mad
 	mkdir -p debian/vlc-mad/usr/share/doc/
 	ln -s vlc debian/vlc-mad/usr/share/doc/vlc-mad
 
@@ -250,6 +255,7 @@ endif
 	mv debian/vlc/usr/lib/vlc/audio_output/libarts_plugin.so \
 		debian/vlc-plugin-arts/usr/lib/vlc/audio_output/
 
+	# Package: vlc-arts
 	mkdir -p debian/vlc-arts/usr/share/doc/
 	ln -s vlc debian/vlc-arts/usr/share/doc/vlc-arts
 
@@ -258,6 +264,7 @@ endif
 	mv debian/vlc/usr/lib/vlc/control/liblirc_plugin.so \
 		debian/vlc-plugin-lirc/usr/lib/vlc/control/
 
+	# Package: vlc-lirc
 	mkdir -p debian/vlc-lirc/usr/share/doc/
 	ln -s vlc debian/vlc-lirc/usr/share/doc/vlc-lirc
 
@@ -266,14 +273,10 @@ endif
 	mv debian/vlc/usr/lib/vlc/video_output/libaa_plugin.so \
 		debian/vlc-plugin-aa/usr/lib/vlc/video_output/
 
+	# Package: vlc-aa
 	mkdir -p debian/vlc-aa/usr/share/doc/
 	ln -s vlc debian/vlc-aa/usr/share/doc/vlc-aa
 
-	# Package: vlc-plugin-xosd
-	ln -s vlc debian/vlc-plugin-xosd/usr/share/doc/vlc-plugin-xosd
-	mv debian/vlc/usr/lib/vlc/visualization/libxosd_plugin.so \
-		debian/vlc-plugin-xosd/usr/lib/vlc/visualization/
-
 	# Package: mozilla-plugin-vlc
 	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
@@ -290,31 +293,11 @@ endif
 	mv debian/vlc/$(VIDDIR)/kvlc48x48.png debian/kvlc/$(PIXDIR)/kvlc.png
 
 	# Package: vlc-plugin-svgalib
+ifeq ($(DEB_BUILD_ARCH),i386)
 	ln -s vlc debian/vlc-plugin-svgalib/usr/share/doc/vlc-plugin-svgalib
 	mv debian/vlc/usr/lib/vlc/video_output/libsvgalib_plugin.so \
 		debian/vlc-plugin-svgalib/usr/lib/vlc/video_output
-
-	# Package: vlc-plugin-dv
-	ln -s vlc debian/vlc-plugin-dv/usr/share/doc/vlc-plugin-dv
-	mv debian/vlc/usr/lib/vlc/codec/libdv_plugin.so \
-		debian/vlc-plugin-dv/usr/lib/vlc/codec
-
-	# Package: vlc-plugin-a52
-	ln -s vlc debian/vlc-plugin-a52/usr/share/doc/vlc-plugin-a52
-	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
-	mv debian/vlc/usr/lib/vlc/access/libsatellite_plugin.so \
-		debian/vlc-plugin-dvb/usr/lib/vlc/access
-
-	# Package: vlc-plugin-ogg
-	ln -s vlc debian/vlc-plugin-ogg/usr/share/doc/vlc-plugin-ogg
-	mv debian/vlc/usr/lib/vlc/demux/libogg_plugin.so \
-		debian/vlc-plugin-ogg/usr/lib/vlc/demux
-	mv debian/vlc/usr/lib/vlc/codec/libvorbis_plugin.so \
-		debian/vlc-plugin-ogg/usr/lib/vlc/codec
+endif
 
 	# Package: wxvlc
 	mv debian/vlc/usr/bin/wxvlc debian/wxvlc/usr/bin/

debian/vlc-plugin-a52.dirs

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

debian/vlc-plugin-dv.dirs

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

debian/vlc-plugin-dvb.dirs

-usr/lib/vlc/access
-usr/share/doc

debian/vlc-plugin-mad.dirs

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

debian/vlc-plugin-ogg.dirs

-usr/lib/vlc/codec
-usr/lib/vlc/demux
-usr/share/doc

debian/vlc-plugin-xosd.dirs

-usr/lib/vlc/visualization
-usr/share/doc