[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090420-1-7-gbc08e4a

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit bc08e4a5bc8fa94eaa8dcb27a25894af72dd635a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri May 8 06:45:31 2009 +0200

    use $(disable_encoders) only in the ffmpeg-debian package
    
    ,----
    | From: Felipe Sateler <fsateler at gmail.com>
    | Subject: Re: [SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090420-1-6-g26f492d
    | To: pkg-multimedia-maintainers at lists.alioth.debian.org
    | Date: Fri, 8 May 2009 08:55:41 +1000
    |
    | [...]
    | Shouldn't this line be protected by some conditional to be able to build the
    | unstripped packages?
    `----
    
    Felipe is totally right.

diff --git a/debian/confflags b/debian/confflags
index 9c47145..d4a67e2 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -56,8 +56,12 @@ disable_encoders += --disable-encoder=msmpeg4v1
 disable_encoders += --disable-encoder=msmpeg4v2
 disable_encoders += --disable-encoder=msmpeg4v3
 
-# disable the next line might enable some additional encoders
+# disabling the next three lines might enable some additional encoders,
+# not in debian at this point, as we munge the source there as well,
+# though
+ifeq ($(DEB_SOURCE),ffmpeg-debian)
 confflags += $(disable_encoders)
+endef
 
 # Common configuration flags
 confflags += --extra-version='$(DEB_VERSION)'

-- 
FFmpeg packaging