[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090420-2-23-gee21dae

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

The following commit has been merged in the master branch:
commit 5bec5ad540f0e69415008d35a5a0464fa798cb11
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed May 13 03:33:30 2009 -0400

    Fix FTBFS for ffmpeg source package with -dev packages (Closes: #527761)
    
      This would fix builds of the ffmpeg source package that are built with -dev
      packages.

diff --git a/debian/confflags b/debian/confflags
index 4d997de..22f2462 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -6,6 +6,9 @@
 FLAVORS := shared
 ifeq ($(DEB_SOURCE),ffmpeg-debian)
 FLAVORS += static
+else ifneq (,$(shell cat debian/control | grep -m 1 -e '^Package: .*-dev$$'))
+# always build static library if we're building dev packages
+FLAVORS += static
 endif
 
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)

-- 
FFmpeg packaging