diff -Nru vlc-1.1.4/debian/changelog vlc-1.1.4/debian/changelog --- vlc-1.1.4/debian/changelog 2010-09-05 02:42:52.000000000 +0200 +++ vlc-1.1.4/debian/changelog 2010-09-06 14:25:49.000000000 +0200 @@ -1,3 +1,17 @@ +vlc (1.1.4-1ubuntu1~bojo1~lucid1) lucid; urgency=low + + * Backport for lucid. + * debian/rules: + - deactive VA-API for lucid + - change dh_install to --list-missing as the amd64 PPA build will "miss" the + files from the vlc-data package as it is only built on i386 + * debian/control: + - downgrade dependencies for FFmpeg + - downgrade dependency on libmodplug-dev + - remove dependency libva-dev + + -- bojo42 Mon, 06 Sep 2010 14:25:20 +0200 + vlc (1.1.4-1ubuntu1) maverick; urgency=low * Merge from Debian experimental, remaining changes: diff -Nru vlc-1.1.4/debian/control vlc-1.1.4/debian/control --- vlc-1.1.4/debian/control 2010-09-05 02:41:36.000000000 +0200 +++ vlc-1.1.4/debian/control 2010-09-06 14:24:31.000000000 +0200 @@ -19,8 +19,8 @@ libass-dev (>= 0.9.5-2), libavahi-client-dev, libavc1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], - libavcodec-dev (>= 4:0.6), - libavformat-dev (>= 4:0.6), + libavcodec-dev (>= 4:0.5), + libavformat-dev (>= 4:0.5), libcaca-dev (>= 0.99.beta4), libcddb2-dev, libcdio-dev, @@ -46,7 +46,7 @@ liblua5.1-0-dev, libmad0-dev, libmatroska-dev (>= 0.8.0), - libmodplug-dev (>= 1:0.8.8.1), + libmodplug-dev (>= 1:0.8.7), libmpcdec-dev, libmpeg2-4-dev, libmtp-dev, @@ -54,7 +54,7 @@ libnotify-dev, libogg-dev, libpng12-dev, - libpostproc-dev (>= 4:0.6), + libpostproc-dev (>= 4:0.5), libproxy-dev, libpulse-dev, libqt4-dev, @@ -67,7 +67,7 @@ libsmbclient-dev, libspeex-dev, libsvga1-dev [amd64 i386], - libswscale-dev (>= 4:0.6), + libswscale-dev (>= 4:0.5), libtag1-dev, libtar-dev, libtheora-dev, @@ -75,7 +75,6 @@ libudev-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libupnp3-dev, libv4l-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], - libva-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libvcdinfo-dev, libvorbis-dev, libx11-dev, diff -Nru vlc-1.1.4/debian/rules vlc-1.1.4/debian/rules --- vlc-1.1.4/debian/rules 2010-09-05 02:41:48.000000000 +0200 +++ vlc-1.1.4/debian/rules 2010-09-06 14:25:03.000000000 +0200 @@ -115,7 +115,6 @@ --enable-atmo \ --enable-dc1394 \ --enable-dv \ - --enable-libva \ --enable-pvr \ --enable-udev \ --enable-v4l \ @@ -191,7 +190,7 @@ ln -sf /usr/share/fonts/truetype/freefont/FreeMonoBold.ttf debian/tmp/usr/share/vlc/skins2/fonts/FreeSansBold.ttf rm -f debian/tmp/usr/share/man/man1/vlc-config.1 # Install stuff - dh_install --fail-missing + dh_install --list-missing # move .hosts if test -d debian/vlc-data; then \ mkdir -p debian/vlc-data/etc/vlc/http; \