[SCM] mplayer packaging branch, master, updated. debian/1.0.rc3+svn20090426-1ubuntu16-13-g03f3126

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 243faec85d956f059955fac03cc41dede36e74d5
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Apr 24 11:38:16 2010 +0200

    Revert "build 'gmplayer' again, but install it in the regular 'gui' package"
    
    This reverts commit 43513bd8751f2fd2bd68be49290546205368ed26.

diff --git a/debian/rules b/debian/rules
index d7711d0..2a4965c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -111,17 +111,17 @@ install-arch: $(QUILT_STAMPFN)
 	# don't build/install mencoder and gui variant to skip binary NEW
 	# #install mencoder
 	# $(MAKE) install-mencoder DESTDIR=$(CURDIR)/debian/mencoder
-	# build gui version
-	[ ! -f config.mak ] || $(MAKE) distclean
-	$(CLEAN_ENV) \
-	./configure $(COMMON_CONFIGURE_FLAGS) $(DEB_BUILD_CONFIGURE) --enable-gui
-	$(CLEAN_ENV) \
-	$(MAKE) mplayer
-	install -D -m 755 mplayer $(CURDIR)/debian/mplayer/usr/bin/gmplayer
-	install -D -m 644 etc/mplayer.desktop \
-	                  $(CURDIR)/debian/mplayer/usr/share/applications/mplayer.desktop
-	install -D -m 644 etc/mplayer.xpm \
-	                  $(CURDIR)/debian/mplayer/usr/share/pixmaps/mplayer.xpm
+	# # build gui version
+	# [ ! -f config.mak ] || $(MAKE) distclean
+	# $(CLEAN_ENV) \
+	# ./configure $(COMMON_CONFIGURE_FLAGS) $(DEB_BUILD_CONFIGURE) --enable-gui
+	# $(CLEAN_ENV) \
+	# $(MAKE)
+	# install -D -m 755 mplayer $(CURDIR)/debian/mplayer-gui/usr/bin/gmplayer
+	# install -D -m 644 etc/mplayer.desktop \
+	#                   $(CURDIR)/debian/mplayer-gui/usr/share/applications/mplayer.desktop
+	# install -D -m 644 etc/mplayer.xpm \
+	#                   $(CURDIR)/debian/mplayer-gui/usr/share/pixmaps/mplayer.xpm
 
 ###### build-indep
 

-- 
mplayer packaging