[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090706-1-3-g449d1e2

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

The following commit has been merged in the master branch:
commit 449d1e2e0b8bf55dfa83b232eb11b0d0b27b7d3f
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue Aug 25 21:27:37 2009 -0400

    Fix ordering of FLAVORS that are installed. (Closes: #543595)
    'shared' should be after 'static' so that ffmpeg and other binaries in 'ffmpeg'
    binary package do not end up being the binaries linked with static ffmpeg
    libraries.

diff --git a/debian/confflags b/debian/confflags
index e871465..6b21b2e 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -2,14 +2,14 @@
 # vim:syntax=make
 #
 # build a static version on every architecture in the ffmpeg-debian package
-# shared is generic, i.e. without arch specific opcodes
-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
+# shared is generic, i.e. without arch specific opcodes
+FLAVORS += shared
 
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)

-- 
FFmpeg packaging