[SCM] mplayer packaging branch, master, updated. debian/1.0.rc3++final-1.exp1-2-gecfb5f0

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e7dc7bbfce213b2dedf5ae34466772e9bba16280
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 31 23:44:43 2010 -0400

    enable mencoder and mplayer-gui

diff --git a/debian/control b/debian/control
index 614a004..558a575 100644
--- a/debian/control
+++ b/debian/control
@@ -65,57 +65,56 @@ Build-Depends: debhelper (>= 7),
                xsltproc,
                zlib1g-dev
 
-# disabled to avoid binary NEW
-# 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: 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,
-#           ttf-freefont,
-#           bzip2,
-#           fontconfig
-# Depends: mplayer,
-#          ${shlibs:Depends},
-#          ${misc:Depends}
-# Description: MPlayer's Movie Encoder
-#  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.
-#  .
-#  This package contains menconder, a simple movie encoder, designed to
-#  encode MPlayer-playable movies
-#  (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET) to other
-#  MPlayer-playable formats. It can encode with various codecs, like DivX4
-#  (1 or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. Also has stream
-#  copying and video resizing abilities.
+Package: mencoder
+Architecture: any
+Suggests: mplayer-doc,
+          ttf-freefont,
+          bzip2,
+          fontconfig
+Depends: mplayer,
+         ${shlibs:Depends},
+         ${misc:Depends}
+Description: MPlayer's Movie Encoder
+ 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.
+ .
+ This package contains menconder, a simple movie encoder, designed to
+ encode MPlayer-playable movies
+ (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET) to other
+ MPlayer-playable formats. It can encode with various codecs, like DivX4
+ (1 or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. Also has stream
+ copying and video resizing abilities.
 
 Package: mplayer
 Architecture: any
diff --git a/debian/rules b/debian/rules
index 57f0f5d..42b03e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -96,8 +96,8 @@ build-arch:
 	dh_testdir
 	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
+	$(MAKE) -f debian/rules debian/mencoder/usr/bin/mencoder
+	$(MAKE) -f debian/rules debian/mplayer-gui/usr/bin/gmplayer
 
 # build non-gui version
 # & mencoder
@@ -109,7 +109,7 @@ debian/mplayer/usr/bin/mplayer debian/mencoder/usr/bin/mencoder:
 	$(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 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

-- 
mplayer packaging