[SCM] mplayer packaging branch, master.experimental, updated. debian/1.0.rc4.try1-1-8-g9622c03

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.experimental branch:
commit 490c1dbad5c83574eb0b2afcd42be00a5ca664d1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Aug 2 19:58:05 2010 -0400

    no longer build mplayer-gui, it doesn't build anymore with shared swscale

diff --git a/debian/control b/debian/control
index 4add692..24c79ce 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,6 @@ Build-Depends: debhelper (>= 7),
                libfribidi-dev,
                libgif-dev,
                libgl1-mesa-dev,
-               libgtk2.0-dev,
                libjack-dev,
                libjpeg62-dev,
                liblircclient-dev,
@@ -70,35 +69,6 @@ Build-Depends: debhelper (>= 7),
                xsltproc,
                zlib1g-dev
 
-Package: mplayer-gui
-Architecture: any
-Suggests: mplayer-doc,
-          ttf-freefont,
-          bzip2,
-          fontconfig
-Depends: mplayer-skin,
-         mplayer,
-         ${shlibs:Depends},
-         ${misc:Depends}
-Replaces: mplayer-doc (<< 2:1.0~rc3+svn20090426-2),
-          mplayer (<< 2:1.0~rc3+svn20090426-2)
-Description: movie player for Unix-like systems
- MPlayer plays most MPEG, VOB, AVI, Ogg/OGM, VIVO,
- ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files,
- supported by many native, XAnim, RealPlayer, and Win32 DLL codecs. It can
- also play VideoCD, SVCD, DVD, 3ivx, RealMedia, and DivX movies.
- .
- Another big feature of MPlayer is the wide range of supported output
- drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev,
- DirectFB, but also SDL (plus all its drivers) and some
- low level card-specific drivers (for Matrox, 3Dfx and Radeon, Mach64
- and Permedia3). Most of them support software or hardware scaling,
- therefore allowing fullscreen display.  MPlayer is also able
- to use some hardware MPEG decoder boards, such as the DVB
- and DXR3/Hollywood+.
- .
- This package includes the gui variant of mplayer.
-
 Package: mencoder
 Architecture: any
 Suggests: mplayer-doc,
diff --git a/debian/rules b/debian/rules
index 6b52113..396a391 100755
--- a/debian/rules
+++ b/debian/rules
@@ -102,7 +102,6 @@ build-arch:
 	dh_prep -a
 	$(MAKE) -f debian/rules debian/mplayer/usr/bin/mplayer
 	$(MAKE) -f debian/rules debian/mencoder/usr/bin/mencoder
-	$(MAKE) -f debian/rules debian/mplayer-gui/usr/bin/gmplayer
 
 # build non-gui version
 # & mencoder
@@ -119,19 +118,6 @@ debian/mplayer/usr/bin/mplayer debian/mencoder/usr/bin/mencoder:
 	install -D -m 644 debian/mplayer.conf \
 	                  $(CURDIR)/debian/mplayer/etc/mplayer/mplayer.conf
 
-# build gui version
-debian/mplayer-gui/usr/bin/gmplayer:
-	dh_testdir
-	$(CLEAN_ENV) \
-	./configure $(CONFIGURE_FLAGS) --enable-gui
-	$(CLEAN_ENV) \
-	$(MAKE) $(NUMJOBS) mplayer
-	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
-
 
 # binaries already installed via build rules as we have to build several flavors
 install-arch: build-arch

-- 
mplayer packaging