[SCM] mplayer packaging branch, master, updated. 556a2fa886ec9a925f1a6fd5e260aaddb1dcbff6

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Mon Mar 2 22:15:40 UTC 2009


The following commit has been merged in the master branch:
commit fb7271ea695943c23313f33a88d94d3fb7f488b9
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Mar 2 22:20:33 2009 +0100

    prefer multiline fields
    
    this is common practice in pkg-multimedia. also sort build depends alphabetically

diff --git a/debian/control b/debian/control
index fc639d2..80604e4 100644
--- a/debian/control
+++ b/debian/control
@@ -9,24 +9,68 @@ Vcs-Git: git://git.debian.org/git/pkg-multimedia/mplayer.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/mplayer;a=summary
 Homepage: http://www.mplayerhq.hu/
 Build-Depends-Indep: 
-Build-Depends: debhelper (>= 4), dpatch, make (>= 3.80), pkg-config, po-debconf,
- libsdl1.2-dev | libsdl1.1-dev, libsvga1-dev [i386 amd64],
- libdts-dev, ladspa-sdk, vstream-client-dev,
- libpng-dev, libncurses5-dev, zlib1g-dev, libspeex-dev, libsmbclient-dev,
- libtheora-dev (>= 1.0~beta1-1), libesd0-dev, liblzo2-dev, libgl1-mesa-dev,
- libasound2-dev (>= 1.0.6-3) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libaudio-dev, libfribidi-dev, libopenal-dev, libmpcdec-dev,
- libvorbis-dev, liblircclient-dev, libfreetype6-dev, libdvdread-dev, 
- libcdparanoia0-dev, libfontconfig1-dev, libjpeg62-dev, libgif-dev,
- libgtk2.0-dev, libdirectfb-dev, libcaca-dev, liblivemedia-dev, libjack-dev, 
- libavcodec-dev (>= 0.svn20080206),  
- libavdevice-dev, libavformat-dev,   libavutil-dev,
- libpostproc-dev,   libswscale-dev,  libx11-dev, libxext-dev, libxinerama-dev, libxv-dev, libxvmc-dev, libxxf86dga-dev, libxxf86vm-dev, x11proto-core-dev, 
+Build-Depends: debhelper (>= 4),
+	       dpatch,
+	       ladspa-sdk,
+	       libasound2-dev (>= 1.0.6-3) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+	       libaudio-dev,
+	       libavcodec-dev (>= 0.svn20080206),
+	       libavdevice-dev,
+	       libavformat-dev,
+	       libavutil-dev,
+	       libcaca-dev,
+	       libcdparanoia0-dev,
+	       libdirectfb-dev,
+	       libdts-dev,
+	       libdvdread-dev,
+	       libesd0-dev,
+	       libfontconfig1-dev,
+	       libfreetype6-dev,
+	       libfribidi-dev,
+	       libgif-dev,
+	       libgl1-mesa-dev,
+	       libgtk2.0-dev,
+	       libjack-dev,
+	       libjpeg62-dev,
+	       liblircclient-dev,
+	       liblivemedia-dev,
+	       liblzo2-dev,
+	       libmpcdec-dev,
+	       libncurses5-dev,
+	       libopenal-dev,
+	       libpng-dev,
+	       libpostproc-dev,
+	       libsdl1.2-dev | libsdl1.1-dev,
+	       libsmbclient-dev,
+	       libspeex-dev,
+	       libsvga1-dev [i386 amd64],
+	       libswscale-dev,
+	       libtheora-dev (>= 1.0~beta1-1),
+	       libvorbis-dev,
+	       libx11-dev,
+	       libxext-dev,
+	       libxinerama-dev,
+	       libxv-dev,
+	       libxvmc-dev,
+	       libxxf86dga-dev,
+	       libxxf86vm-dev,
+	       make (>= 3.80),
+	       pkg-config,
+	       po-debconf,
+	       vstream-client-dev,
+	       x11proto-core-dev,
+	       zlib1g-dev
 
 Package: mplayer
 Architecture: any
-Suggests: mplayer-doc, ttf-freefont, netselect | fping, bzip2, fontconfig
-Depends: ${shlibs:Depends}, debconf | debconf-2.0, mplayer-skin
+Suggests: mplayer-doc,
+	  ttf-freefont,
+	  netselect | fping,
+	  bzip2,
+	  fontconfig
+Depends: debconf | debconf-2.0,
+	 mplayer-skin,
+	 ${shlibs:Depends}
 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,

-- 
mplayer packaging



More information about the pkg-multimedia-commits mailing list