[SCM] libav/ubuntu.extra: minimize diff with 'ubuntu' branch

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.extra branch:
commit 28616373a80d583ee68097949d3d0343f0ac739f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jun 17 19:45:07 2012 +0200

    minimize diff with 'ubuntu' branch

diff --git a/debian/control b/debian/control
index f146f50..3f5f16e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: libs
 Priority: optional
 Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
+Uploaders:
+ Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
  Loic Minier <lool at dooz.org>,
  Reinhard Tartler <siretart at tauware.de>,
  Fabian Greffrath <fabian+debian at greffrath.com>,
@@ -14,8 +15,9 @@ Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/libav.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libav.git;a=summary
 Homepage: http://libav.org/
-Build-Depends: debhelper (>= 9),
- libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+Build-Depends:
+ debhelper (>= 9),
+ libasound2-dev [linux-any],
  libav-source (>= 4:0.8.3-0ubuntu1),
  libbz2-dev,
  libcdio-cdda-dev,
diff --git a/debian/libav-tools.install b/debian/libav-tools.install
index 3889019..6616a2c 100644
--- a/debian/libav-tools.install
+++ b/debian/libav-tools.install
@@ -1,4 +1,5 @@
 etc
-usr/bin
+usr/bin/av*
+usr/bin/qt-faststart
 usr/share/avconv/*.avpreset
-usr/share/man
+usr/share/man/man1/av*

-- 
Libav/FFmpeg packaging