[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090609-1-16-gde308c2

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

The following commit has been merged in the master branch:
commit de308c207658124af22bc25fff7ff2b312592ff9
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Thu Jul 9 10:04:59 2009 +0200

    Remove parallel make support from debian/confflags, it's overridden in debian/rules anyway.

diff --git a/debian/confflags b/debian/confflags
index 67249db..37711c2 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -182,13 +182,6 @@ vis_build_confflags += --disable-ffmpeg
 vis_build_confflags += --disable-ffserver
 vis_build_confflags += --disable-ffplay
 
-# Support multiple makes at once (taken from the qemu package)
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-  NJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-else
-  NJOBS := 1
-endif
-
 # Additional documentation for PowerPC
 ifneq (,$(findstring powerpc,$(DEB_BUILD_GNU_TYPE)))
   extradoc := doc/ffmpeg_powerpc_performance_evaluation_howto.txt
diff --git a/debian/rules b/debian/rules
index b0dee9e..25bafa3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,7 @@ ifneq ($(DEB_SOURCE),ffmpeg-debian)
 DEB_BUILD_OPTIONS += ,internalencoders
 endif
 
+# Support multiple makes at once
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 NUMJOBS = -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 else

-- 
FFmpeg packaging