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

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit dbb1ae4162817cc8e81e8bc391ae87213076e5ec
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Aug 26 09:11:20 2009 +0200

    simply debian/confflags by removing the case of renaming the source package (Closes: #543595)
    
    this cases make too much confusion and now that the source package is
    renamed back to 'ffmpeg', all of them need to be reconsidered again
    anyway.

diff --git a/debian/confflags b/debian/confflags
index 6b21b2e..aafd88b 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -1,13 +1,9 @@
 # -*- mode: makefile -*-
 # vim:syntax=make
 #
-# build a static version on every architecture in the ffmpeg-debian package
-ifeq ($(DEB_SOURCE),ffmpeg-debian)
+# build a static version on every architecture in the 'debian' ffmpeg package
 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
 

-- 
FFmpeg packaging