[SCM] mplayer packaging branch, ubuntu, updated. debian/1.0.rc3++final-0ubuntu2

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 0e639e99a2333e8c0cd8b7e8d0f67c547e8b8f1c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jun 3 09:50:47 2010 +0200

    merge build rules for mplayer and mencoder package
    
    this save a configure call

diff --git a/debian/rules b/debian/rules
index c39ae0a..2e25c2c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -107,26 +107,20 @@ build-arch:
 	$(MAKE) -f debian/rules debian/mplayer-gui/usr/bin/gmplayer
 
 # build non-gui version
-debian/mplayer/usr/bin/mplayer:
+# & mencoder
+debian/mplayer/usr/bin/mplayer debian/mencoder/usr/bin/mencoder:
 	dh_testdir
 	$(CLEAN_ENV) \
 	./configure $(COMMON_CONFIGURE_FLAGS) $(DEB_BUILD_CONFIGURE) --disable-gui
 	$(CLEAN_ENV) \
-	$(MAKE) $(NUMJOBS) mplayer 
+	$(MAKE) $(NUMJOBS) mplayer mencoder
 	$(MAKE) install-mplayer DESTDIR=$(CURDIR)/debian/mplayer
 	$(MAKE) install-mplayer-man DESTDIR=$(CURDIR)/debian/mplayer
+	$(MAKE) install-mencoder DESTDIR=$(CURDIR)/debian/mencoder
 	$(MAKE) install-mencoder-man DESTDIR=$(CURDIR)/debian/mplayer
 	install -D -m 644 debian/mplayer.conf \
 	                  $(CURDIR)/debian/mplayer/etc/mplayer/mplayer.conf
 
-# build & install mencoder
-debian/mencoder/usr/bin/mencoder:
-	dh_testdir
-	$(CLEAN_ENV) \
-	./configure $(COMMON_CONFIGURE_FLAGS) $(DEB_BUILD_CONFIGURE) --disable-gui
-	$(MAKE) $(NUMJOBS) mencoder
-	$(MAKE) install-mencoder DESTDIR=$(CURDIR)/debian/mencoder
-
 # build gui version
 debian/mplayer-gui/usr/bin/gmplayer:
 	dh_testdir

-- 
mplayer packaging