* debian: updated Debian build files.

debian/changelog

+vlc (0.8.4-test2-2) unstable; urgency=low
+
+  * extras/x264/configure:
+    + Teach the configure script about the Alpha platform.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Fri, 11 Nov 2005 18:49:31 +0100
+
+vlc (0.8.4-test2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    + Build-depend on a newer version of gnutls (Closes: #335774).
+    + Replaced occurrences of "wxwindows" with "wxwidgets" (Closes: #330141).
+  * debian/rules:
+    + Use dh_buildinfo because of all the static libraries we use.
+  * Upstream fixed the wx code so that it builds with newer versions of the
+    library (Closes: #332282, #332773).
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Fri, 11 Nov 2005 10:41:35 +0100
+
+vlc (0.8.4-svn20050920-3) unstable; urgency=low
+
+  * configure.ac:
+    + Fixed a bug in the gnomevfs plugin configuration.
+  * debian/rules:
+    + Explicitly disable the GnomeVFS plugin (Closes: #329317).
+  * debian/control:
+    + Buuild-depend on yasm on amd64.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Wed, 21 Sep 2005 11:36:24 +0200
+
+vlc (0.8.4-svn20050920-2) unstable; urgency=low
+
+  * configure:
+    + Fixed the powerpc build with gcc-4.x.
+  * extras/x264/configure:
+    + Added missing Debian architectures to the configure script.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Tue, 20 Sep 2005 17:46:35 +0200
+
 vlc (0.8.4-svn20050920-1) unstable; urgency=low
 
   * New SVN snapshot.

debian/control

@@ -2,7 +2,7 @@ Source: vlc
 Section: graphics
 Priority: optional
 Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org>
-Build-Depends: debhelper (>= 4.0), dpatch, gettext, libx11-dev, libxext-dev, libxt-dev, libxv-dev, xlibs-static-pic, libggi2-dev, libglide2-dev [i386], libesd0-dev, libaudiofile-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libasound2-dev (>= 0.9.0beta10a), libarts1-dev (>= 1.4.2-1), libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, libaa1-dev, libdvbpsi4-dev, mozilla-dev (>= 2:1.7.10-1), libidl0, libglib2.0-0, libxosd-dev (>= 2.2.4-1.3), libsvga1-dev [i386], libogg-dev, libvorbis-dev, libwxgtk2.6-dev, libdvdread3-dev, libflac-dev (>= 1.1.2-3), libimlib2-dev, libmatroska-dev (>= 0.7.7), libfreetype6-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.9), liblivemedia-dev (>= 2004.11.11a-1), libmpeg2-4-dev, zlib1g-dev, libdts-dev, libfribidi-dev, libcdio-dev, libxml2-dev, libid3tag0-dev, libtheora-dev, nasm, libmodplug-dev, libhal-dev, libtar-dev, libdvdnav-dev, libgnutls11-dev, libavcodec-dev (>= 0.cvs20050918-2), libavformat-dev (>= 0.cvs20050918-2), libpostproc-dev (>= 0.cvs20050918-2), libncurses5-dev, libpng12-dev, xlibmesa-gl-dev, libsmbclient-dev, gcc-snapshot [i386 amd64]
+Build-Depends: debhelper (>= 4.0), dh-buildinfo, dpatch, gettext, libx11-dev, libxext-dev, libxt-dev, libxv-dev, xlibs-static-pic, libggi2-dev, libglide2-dev [i386], libesd0-dev, libaudiofile-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libasound2-dev (>= 0.9.0beta10a), libarts1-dev (>= 1.4.2-1), libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, libaa1-dev, libdvbpsi4-dev, mozilla-dev (>= 2:1.7.10-1), libidl0, libglib2.0-0, libxosd-dev (>= 2.2.4-1.3), libsvga1-dev [i386], libogg-dev, libvorbis-dev, libwxgtk2.6-dev, libdvdread3-dev, libflac-dev (>= 1.1.2-3), libimlib2-dev, libmatroska-dev (>= 0.7.7), libfreetype6-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.9), liblivemedia-dev (>= 2004.11.11a-1), libmpeg2-4-dev, zlib1g-dev, libdts-dev, libfribidi-dev, libcdio-dev, libxml2-dev, libid3tag0-dev, libtheora-dev, nasm, libmodplug-dev, libhal-dev, libtar-dev, libdvdnav-dev, libgnutls-dev (>= 1.2.8), libavcodec-dev (>= 0.cvs20050918-2), libavformat-dev (>= 0.cvs20050918-2), libpostproc-dev (>= 0.cvs20050918-2), libncurses5-dev, libpng12-dev, xlibmesa-gl-dev, libsmbclient-dev, gcc-snapshot [i386 amd64], yasm [amd64]
 Standards-Version: 3.6.2.1
 
 Package: vlc
@@ -211,9 +211,9 @@ Description: SVGAlib video output plugin for VLC
 Package: wxvlc
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: wxWindows frontend for VLC
- This plugin adds a wxWindow interface to the VLC media player. To activate
- the wxWindow GUI, use the `--intf wxwin' flag or run the `wxvlc' program.
+Description: wxWidgets frontend for VLC
+ This plugin adds a wxWidgets interface to the VLC media player. To activate
+ the wxWidgets GUI, use the `--intf wx' flag or run the `wxvlc' program.
  .
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
  DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia

debian/rules

@@ -68,6 +68,7 @@ vlc_confflags += \
 	--enable-ffmpeg \
 	--enable-ncurses \
 	--enable-smb \
+	--disable-gnomevfs \
 	$(NULL)
 
 # These ones are currently shipped with VLC
@@ -157,6 +158,12 @@ build-stamp: patch configure-stamp
 	# Build all the rest, with the PIC libs
 	AM_MAKEFLAGS='builtin=no' $(MAKE)
 
+	# Minor test, to see which plugins were built and whether they load
+	# properly.
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+	./vlc --reset-plugins-cache -l -I rc vlc:quit
+endif
+
 	touch build-stamp
 
 clean: unpatch
@@ -331,6 +338,7 @@ binary-arch: build install
 	dh_testroot
 #	dh_installdebconf	
 	dh_installdocs -p vlc
+	dh_buildinfo -p vlc
 #	dh_installexamples
 	dh_installmenu -s
 	dh_installmime -s