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

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1ff3ca5c1f140e1848331e33bfd02004a591d7ec
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 5 19:51:07 2009 +0200

    remove hack to build with stripped sources
    
    since we no longer strip the sources, we no longer need to fake the
    included config files to ensure the build succeeds.

diff --git a/debian/rules b/debian/rules
index 3029085..101fc33 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,29 +31,20 @@ NUMJOBS := -j$(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
 endif
 endif
 
-internalencoders := $(findstring internalencoders,$(DEB_BUILD_OPTIONS))
-
 include debian/confflags
 
 $(info FLAVORS = $(FLAVORS))
 $(info DEB_BUILD_OPTIONS = $(DEB_BUILD_OPTIONS))
 $(info CFLAGS = $(CFLAGS))
-$(info internalencoders = $(internalencoders))
-
-config-extra-includes.h:
-	sh debian/fixup-config.sh > $@
 
 configure-%: configure-stamp-%
-configure-stamp-%: $(QUILT_STAMPFN) config-extra-includes.h
+configure-stamp-%: $(QUILT_STAMPFN)
 	dh_testdir
 	mkdir -p debian-$*
 	[ ! -r .svnrevision ] || \
 		echo "SVN-r`cat .svnrevision`" > debian-$*/snapshot_version
 	cd debian-$* && CFLAGS="$(CFLAGS)" $(CURDIR)/configure \
 		$($*_build_confflags) $(extra_$*_build_confflags)
-ifeq ($(internalencoders),)
-	echo "#include \"config-extra-includes.h\"" >> debian-$*/config.h
-endif
 	touch $@
 
 build-%: build-stamp-%

-- 
FFmpeg packaging