[SCM] xbmc packaging branch, master, updated. upstream/9.11.svn24886.deb1-49-g5d53154

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9345eaf64455a49d0d92cdc85b0ec2399d738f76
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue Dec 1 23:00:44 2009 -0500

    Update build dependencies for compatibility with Ubuntu.

diff --git a/debian/control b/debian/control
index 10825d9..623e41b 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,8 @@ Build-Depends: debhelper (>= 7.0.50), python-support, cmake,
  libgl1-mesa-dev | libgl-dev, libglu-dev, libglew-dev, libmad0-dev,
  libjpeg-dev, libsamplerate-dev, libogg-dev, libvorbis-dev, libfreetype6-dev,
  libfontconfig-dev, libbz2-dev, libfribidi-dev, libsqlite3-dev,
- libmysqlclient-dev, libasound-dev, libpng-dev, libpcre3-dev, liblzo2-dev,
- libcdio-dev, libsdl-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev,
+ libmysqlclient-dev, libasound-dev, libpng12-dev | libpng-dev, libpcre3-dev,
+ liblzo2-dev, libcdio-dev, libsdl-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev,
  libenca-dev, libjasper-dev, libxt-dev, libxtst-dev, libxmu-dev,
  libxinerama-dev, libcurl4-gnutls-dev | libcurl-dev, libdbus-1-dev,
  libhal-storage-dev, libhal-dev, libpulse-dev, libavahi-common-dev,
@@ -20,7 +20,8 @@ Build-Depends: debhelper (>= 7.0.50), python-support, cmake,
  libmpeg2-4-dev, libass-dev, libmpcdec-dev, libflac-dev, libwavpack-dev,
  python-dev, gawk, gperf, nasm [!amd64], libcwiid1-dev, libbluetooth-dev,
  zlib1g-dev, libmms-dev, libsmbclient-dev, libfaad-dev, libiso9660-dev,
- libssl-dev, lsb-release,
+ libssl-dev, lsb-release, libvdpau-dev | nvidia-190-libvdpau-dev |
+ nvidia-185-libvdpau-dev | nvidia-180-libvdpau-dev,
 Standards-Version: 3.8.3
 Homepage: http://xbmc.org/
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/xbmc.git
diff --git a/debian/var_info b/debian/var_info
index 25c3a82..15dc59c 100644
--- a/debian/var_info
+++ b/debian/var_info
@@ -7,8 +7,8 @@ BUILD_DEPENDS="debhelper (>= 7.0.50), python-support, cmake,
  libgl1-mesa-dev | libgl-dev, libglu-dev, libglew-dev, libmad0-dev,
  libjpeg-dev, libsamplerate-dev, libogg-dev, libvorbis-dev, libfreetype6-dev,
  libfontconfig-dev, libbz2-dev, libfribidi-dev, libsqlite3-dev,
- libmysqlclient-dev, libasound-dev, libpng-dev, libpcre3-dev, liblzo2-dev,
- libcdio-dev, libsdl-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev,
+ libmysqlclient-dev, libasound-dev, libpng12-dev | libpng-dev, libpcre3-dev,
+ liblzo2-dev, libcdio-dev, libsdl-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev,
  libenca-dev, libjasper-dev, libxt-dev, libxtst-dev, libxmu-dev,
  libxinerama-dev, libcurl4-gnutls-dev | libcurl-dev, libdbus-1-dev,
  libhal-storage-dev, libhal-dev, libpulse-dev, libavahi-common-dev,
@@ -17,7 +17,8 @@ BUILD_DEPENDS="debhelper (>= 7.0.50), python-support, cmake,
  libmpeg2-4-dev, libass-dev, libmpcdec-dev, libflac-dev, libwavpack-dev,
  python-dev, gawk, gperf, nasm [!amd64], libcwiid1-dev, libbluetooth-dev,
  zlib1g-dev, libmms-dev, libsmbclient-dev, libfaad-dev, libiso9660-dev,
- libssl-dev, lsb-release,"
+ libssl-dev, lsb-release, libvdpau-dev | nvidia-190-libvdpau-dev |
+ nvidia-185-libvdpau-dev | nvidia-180-libvdpau-dev,"
 
 if [ $(lsb_release -is) = "Ubuntu" ]; then
     BUILD_DEPENDS="$BUILD_DEPENDS libfaac-dev,"

-- 
xbmc packaging