[SCM] mplayer packaging branch, master, updated. debian/1.0.rc3+svn20100502-3-4-g32b4f56
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Wed May 26 06:59:40 UTC 2010
The following commit has been merged in the master branch:
commit f7a823bb7a7d7cdf752b7d4c2dcff45ecff6dab4
Author: Reinhard Tartler <siretart at tauware.de>
Date: Wed May 26 08:17:59 2010 +0200
enable mplayer-gui (Closes: #579925) and mencoder packages. (Closes: #396954, #400940, #580168)
diff --git a/debian/control b/debian/control
index 3246c40..5e76ec7 100644
--- a/debian/control
+++ b/debian/control
@@ -71,59 +71,56 @@ Build-Depends: debhelper (>= 7),
zlib1g-dev
# disabled to avoid binary NEW
-# Package: mplayer-gui
-# Architecture: any
-# Suggests: mplayer-doc,
-# ttf-freefont,
-# netselect | fping,
-# 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+.
-# .
-# Not all of the upstream code is distributed in the source tarball.
-# See the README.Debian and copyright files for details.
+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.
-# disabled to avoid binary NEW
-# 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
@@ -181,12 +178,3 @@ Description: documentation for MPlayer
.
You only need this package if you want to read the mplayer manual. The manpages
are included in the regular mplayer package.
-
-# disabled to avoid binary NEW
-# Package: mplayer-nogui
-# Architecture: all
-# Depends: mplayer,
-# ${misc:Depends}
-# Description: movie player for Unix-like systems (transitional package)
-# This is a transitional package to assist with upgrading from older
-# versions of mplayer. It can be safely removed.
diff --git a/debian/rules b/debian/rules
index c9c289d..c254829 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,30 +103,28 @@ install-arch: mencoder.c $(QUILT_STAMPFN)
dh_prep -a
[ ! -f config.mak ] || $(MAKE) distclean
echo "$(UPSTREAM_VERSION)" > snapshot_version
+ # build non-gui version
$(CLEAN_ENV) \
- ./configure $(COMMON_CONFIGURE_FLAGS) $(DEB_BUILD_CONFIGURE) --disable-gui --disable-mencoder
+ ./configure $(COMMON_CONFIGURE_FLAGS) $(DEB_BUILD_CONFIGURE) --disable-gui
$(CLEAN_ENV) \
$(MAKE)
- # build non-gui version
$(MAKE) install-mplayer DESTDIR=$(CURDIR)/debian/mplayer
$(MAKE) install-mplayer-man DESTDIR=$(CURDIR)/debian/mplayer
$(MAKE) install-mencoder-man DESTDIR=$(CURDIR)/debian/mplayer
install -D -m 644 debian/mplayer.conf \
$(CURDIR)/debian/mplayer/etc/mplayer/mplayer.conf
- # 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)
- # 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
+ #install mencoder
+ $(MAKE) install-mencoder DESTDIR=$(CURDIR)/debian/mencoder
+ # build gui version
+ $(CLEAN_ENV) \
+ ./configure $(COMMON_CONFIGURE_FLAGS) $(DEB_BUILD_CONFIGURE) --enable-gui
+ $(CLEAN_ENV) \
+ $(MAKE) 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
###### build-indep
@@ -194,6 +192,5 @@ get-orig-source:
PHONY += build clean binary-indep binary-arch binary-common binary
PHONY += install binary binary-arch binary-indep clean checkroot get-orig-source
PHONY += autocontrol fix-orig-source copy-orig-from-svn download-and-unpack-orig
-PHONY += build-gui build-nogui install-gui install-nogui
.PHONY: $(PHONY)
--
mplayer packaging
More information about the pkg-multimedia-commits
mailing list