[SCM] mplayer packaging branch, ubuntu, updated. debian/1.0.rc4.try1-1-22-g6729499

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit d5cb8963cb7e593abbe22d1470efa1150f46ba26
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jul 29 07:43:48 2010 -0400

    ensure that patches are actually applied during build

diff --git a/debian/rules b/debian/rules
index bfd8998..2dd1a81 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,6 +103,7 @@ build-arch:
 # & mencoder
 debian/mplayer/usr/bin/mplayer debian/mencoder/usr/bin/mencoder:
 	dh_testdir
+	! test -d .git || quilt push -a
 	$(CLEAN_ENV) \
 	./configure $(CONFIGURE_FLAGS) --disable-gui
 	$(CLEAN_ENV) \
@@ -117,6 +118,7 @@ debian/mplayer/usr/bin/mplayer debian/mencoder/usr/bin/mencoder:
 # build gui version
 debian/mplayer-gui/usr/bin/gmplayer:
 	dh_testdir
+	! test -d .git || quilt push -a
 	$(CLEAN_ENV) \
 	./configure $(CONFIGURE_FLAGS) --enable-gui
 	$(CLEAN_ENV) \

-- 
mplayer packaging