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

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Thu Jun 3 13:06:40 UTC 2010


The following commit has been merged in the ubuntu branch:
commit 76284d4141ffa547475279f3182ca69797686767
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jun 3 09:51:45 2010 +0200

    remove unreferenced COMMON_CONFIGURE_FLAGS macro

diff --git a/debian/rules b/debian/rules
index 2e25c2c..9c923c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -111,7 +111,7 @@ build-arch:
 debian/mplayer/usr/bin/mplayer debian/mencoder/usr/bin/mencoder:
 	dh_testdir
 	$(CLEAN_ENV) \
-	./configure $(COMMON_CONFIGURE_FLAGS) $(DEB_BUILD_CONFIGURE) --disable-gui
+	./configure $(DEB_BUILD_CONFIGURE) --disable-gui
 	$(CLEAN_ENV) \
 	$(MAKE) $(NUMJOBS) mplayer mencoder
 	$(MAKE) install-mplayer DESTDIR=$(CURDIR)/debian/mplayer
@@ -125,7 +125,7 @@ debian/mplayer/usr/bin/mplayer debian/mencoder/usr/bin/mencoder:
 debian/mplayer-gui/usr/bin/gmplayer:
 	dh_testdir
 	$(CLEAN_ENV) \
-	./configure $(COMMON_CONFIGURE_FLAGS) $(DEB_BUILD_CONFIGURE) --enable-gui
+	./configure $(DEB_BUILD_CONFIGURE) --enable-gui
 	$(CLEAN_ENV) \
 	$(MAKE) $(NUMJOBS) mplayer
 	install -D -m 755 mplayer $(CURDIR)/debian/mplayer-gui/usr/bin/gmplayer

-- 
mplayer packaging



More information about the pkg-multimedia-commits mailing list