[SCM] mplayer packaging branch, master, updated. upstream/1.0rc2+svn20090303-86-g4772e91

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5fff77074c1c257ec3daa3a1e781cfc920d8d4a4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 11 12:27:59 2009 +0100

    do not run the actual rules of debian/rules in parallel
    
    sub-makes can go in parallel, depending on the settings in
    DEB_BUILD_OPTIONS. But the actual debian/rules files should not be
    executed for 2 reasons:
    
     - there are bugs in the dependencies of the rules. The source needs to
       be configured before building the documentation, but the current rules
       break because of this atm
    
     - the buildlogs are much less clear if configuring (or other unrelated
       building steps) are interleaved

diff --git a/debian/rules b/debian/rules
index e6fd9d3..0e36465 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,10 @@ include /usr/share/quilt/quilt.make
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
+# do not run the actual rules of this makefile in parallel. sub-makes
+# can go in parallel
+.NOTPARALLEL:
+
 ############
 
 DEB_SOURCE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')

-- 
mplayer packaging