r954 - /videolan/vlc/debian/control
xtophe-guest at users.alioth.debian.org
xtophe-guest at users.alioth.debian.org
Sat Dec 15 21:25:41 UTC 2007
Author: xtophe-guest
Date: Sat Dec 15 21:25:40 2007
New Revision: 954
URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=954
Log:
Use the same indentation so hopefully the merge will go better
Modified:
videolan/vlc/debian/control
Modified: videolan/vlc/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/control?rev=954&op=diff
==============================================================================
--- videolan/vlc/debian/control (original)
+++ videolan/vlc/debian/control Sat Dec 15 21:25:40 2007
@@ -4,78 +4,78 @@
Maintainer: VideoLAN <vlc-devel at videolan.org>
Uploaders: Christophe Mutricy <xtophe at videolan.org>
Build-Depends: dpkg-dev (>= 1.13.19),
- debhelper (>= 5.0),
- dh-buildinfo,
- quilt,
- nasm,
- yasm [amd64 kfreebsd-amd64],
- gettext,
- xulrunner,
- libxul-dev,
- xlibmesa-gl-dev,
- liba52-0.7.4-dev,
- libaa1-dev,
- libarts1-dev (>= 1.4.2-1),
- libasound2-dev (>= 0.9.0beta10a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libaudiofile-dev,
- libavahi-client-dev,
- libavcodec-dev (>= 0.cvs20060823-1),
- libavformat-dev (>= 0.cvs20060823-1),
- libcaca-dev (>= 0.99.beta4-1),
- libcdio-dev (>= 0.78.2-1),
- libdvbpsi4-dev,
- libdvdnav-dev,
- libdvdread-dev (>= 0.9.5),
- libesd0-dev,
- libflac-dev (>= 1.1.2-3),
- libfreetype6-dev,
- libfribidi-dev,
- libggi2-dev,
- libglib2.0-0,
- libglide2-dev [i386],
- libgnutls-dev (>= 1.2.8),
- libhal-dev (>= 0.5.5.1-3) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libid3tag0-dev,
- libidl0,
- libimlib2-dev,
- liblircclient-dev,
- liblivemedia-dev (>= 2006.03.17),
- libmad0-dev,
- libmatroska-dev (>= 0.8.0),
- libmodplug-dev,
- libmpcdec-dev,
- libmpeg2-4-dev,
- libncurses5-dev,
- libogg-dev,
- libpostproc-dev (>= 0.cvs20060823-1),
- libpng12-dev,
- libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3),
- libsmbclient-dev,
- libsvga1-dev [i386],
- libsysfs-dev,
- libtar-dev,
- libtheora-dev,
- libvcdinfo-dev,
- libvorbis-dev,
- libwxgtk2.6-dev,
- libx11-dev,
- libxext-dev,
- libxml2-dev,
- libxt-dev,
- libxv-dev,
- zlib1g-dev,
- libavc1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libnotify-dev,
- libtwolame-dev (>= 0.3.8-1),
- libspeex-dev,
- libsdl-image1.2-dev,
- libshout3-dev,
- libqt4-dev,
- qt4-dev-tools,
- libfaad-dev,
- libjack-dev
+ debhelper (>= 5.0),
+ dh-buildinfo,
+ quilt,
+ nasm,
+ yasm [amd64 kfreebsd-amd64],
+ gettext,
+ xulrunner,
+ libxul-dev,
+ xlibmesa-gl-dev,
+ liba52-0.7.4-dev,
+ libaa1-dev,
+ libarts1-dev (>= 1.4.2-1),
+ libasound2-dev (>= 0.9.0beta10a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libaudiofile-dev,
+ libavahi-client-dev,
+ libavcodec-dev (>= 0.cvs20060823-1),
+ libavformat-dev (>= 0.cvs20060823-1),
+ libcaca-dev (>= 0.99.beta4-1),
+ libcdio-dev (>= 0.78.2-1),
+ libdvbpsi4-dev,
+ libdvdnav-dev,
+ libdvdread-dev (>= 0.9.5),
+ libesd0-dev,
+ libflac-dev (>= 1.1.2-3),
+ libfreetype6-dev,
+ libfribidi-dev,
+ libggi2-dev,
+ libglib2.0-0,
+ libglide2-dev [i386],
+ libgnutls-dev (>= 1.2.8),
+ libhal-dev (>= 0.5.5.1-3) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libid3tag0-dev,
+ libidl0,
+ libimlib2-dev,
+ liblircclient-dev,
+ liblivemedia-dev (>= 2006.03.17),
+ libmad0-dev,
+ libmatroska-dev (>= 0.8.0),
+ libmodplug-dev,
+ libmpcdec-dev,
+ libmpeg2-4-dev,
+ libncurses5-dev,
+ libogg-dev,
+ libpostproc-dev (>= 0.cvs20060823-1),
+ libpng12-dev,
+ libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3),
+ libsmbclient-dev,
+ libsvga1-dev [i386],
+ libsysfs-dev,
+ libtar-dev,
+ libtheora-dev,
+ libvcdinfo-dev,
+ libvorbis-dev,
+ libwxgtk2.6-dev,
+ libx11-dev,
+ libxext-dev,
+ libxml2-dev,
+ libxt-dev,
+ libxv-dev,
+ zlib1g-dev,
+ libavc1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libnotify-dev,
+ libtwolame-dev (>= 0.3.8-1),
+ libspeex-dev,
+ libsdl-image1.2-dev,
+ libshout3-dev,
+ libqt4-dev,
+ qt4-dev-tools,
+ libfaad-dev,
+ libjack-dev
#Build-Conflicts-Indep: libvlc0
Standards-Version: 3.7.3
Homepage: http://www.videolan.org/vlc
@@ -86,38 +86,38 @@
Section: graphics
Architecture: any
Depends: vlc-nox (= ${binary:Version}),
- ${shlibs:Depends},
- ${misc:Depends},
- ttf-dejavu-core
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ttf-dejavu-core
Suggests: mozilla-plugin-vlc, videolan-doc
Replaces: vlc-nox (<<${Source-Version}),
- vlc-plugin-dvb (<< 0.5.2-2),
- vlc-plugin-xosd (<< 0.5.2-2),
- vlc-plugin-dv (<< 0.5.2-2),
- vlc-plugin-mad (<< 0.5.2-2),
- vlc-mad (<< 0.5.0),
- vlc-plugin-a52 (<< 0.5.2-2),
- vlc-plugin-ogg (<< 0.5.2-2),
- vlc-plugin-lirc (<< 0.5.2-2),
- vlc-lirc (<< 0.5.0),
- vlc-plugin-aa (<< 0.5.2-2),
- vlc-aa (<< 0.5.0),
- wxvlc (<< 0.8.5-test3.debian-4),
- vlc-plugin-alsa (<< 0.8.5-test3.debian-4)
+ vlc-plugin-dvb (<< 0.5.2-2),
+ vlc-plugin-xosd (<< 0.5.2-2),
+ vlc-plugin-dv (<< 0.5.2-2),
+ vlc-plugin-mad (<< 0.5.2-2),
+ vlc-mad (<< 0.5.0),
+ vlc-plugin-a52 (<< 0.5.2-2),
+ vlc-plugin-ogg (<< 0.5.2-2),
+ vlc-plugin-lirc (<< 0.5.2-2),
+ vlc-lirc (<< 0.5.0),
+ vlc-plugin-aa (<< 0.5.2-2),
+ vlc-aa (<< 0.5.0),
+ wxvlc (<< 0.8.5-test3.debian-4),
+ vlc-plugin-alsa (<< 0.8.5-test3.debian-4)
Conflicts: vlc-nox (<<${Source-Version}),
- vlc-plugin-dvb (<< 0.5.2-2),
- vlc-plugin-xosd (<< 0.5.2-2),
- vlc-plugin-dv (<< 0.5.2-2),
- vlc-plugin-mad (<< 0.5.2-2),
- vlc-mad (<< 0.5.0),
- vlc-plugin-a52 (<< 0.5.2-2),
- vlc-plugin-ogg (<< 0.5.2-2),
- vlc-plugin-lirc (<< 0.5.2-2),
- vlc-lirc (<< 0.5.0),
- vlc-plugin-aa (<< 0.5.2-2),
- vlc-aa (<< 0.5.0),
- wxvlc (<< 0.8.5-test3.debian-4),
- vlc-plugin-alsa (<< 0.8.5-test3.debian-4)
+ vlc-plugin-dvb (<< 0.5.2-2),
+ vlc-plugin-xosd (<< 0.5.2-2),
+ vlc-plugin-dv (<< 0.5.2-2),
+ vlc-plugin-mad (<< 0.5.2-2),
+ vlc-mad (<< 0.5.0),
+ vlc-plugin-a52 (<< 0.5.2-2),
+ vlc-plugin-ogg (<< 0.5.2-2),
+ vlc-plugin-lirc (<< 0.5.2-2),
+ vlc-lirc (<< 0.5.0),
+ vlc-plugin-aa (<< 0.5.2-2),
+ vlc-aa (<< 0.5.0),
+ wxvlc (<< 0.8.5-test3.debian-4),
+ vlc-plugin-alsa (<< 0.8.5-test3.debian-4)
Provides: mp3-decoder
Description: multimedia player and streamer
VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
@@ -140,8 +140,8 @@
Section: graphics
Architecture: any
Depends: ${shlibs:Depends},
- ${misc:Depends},
- vlc (= ${source:Version})
+ ${misc:Depends},
+ vlc (= ${source:Version})
Provides: mp3-decoder
Description: debugging symbols for vlc
VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
@@ -155,35 +155,35 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: vlc (<<${Source-Version}),
- vlc-plugin-dvb (<< 0.5.2-2),
- vlc-plugin-xosd (<< 0.5.2-2),
- vlc-plugin-dv (<< 0.5.2-2),
- vlc-plugin-mad (<< 0.5.2-2),
- vlc-mad (<< 0.5.0),
- vlc-plugin-a52 (<< 0.5.2-2),
- vlc-plugin-ogg (<< 0.5.2-2),
- vlc-plugin-lirc (<< 0.5.2-2),
- vlc-lirc (<< 0.5.0),
- vlc-plugin-aa (<< 0.5.2-2),
- vlc-aa (<< 0.5.0),
- wxvlc (<< 0.8.5-test3.debian-4),
- vlc-plugin-alsa (<< 0.8.5-test3.debian-4),
- vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3)
+ vlc-plugin-dvb (<< 0.5.2-2),
+ vlc-plugin-xosd (<< 0.5.2-2),
+ vlc-plugin-dv (<< 0.5.2-2),
+ vlc-plugin-mad (<< 0.5.2-2),
+ vlc-mad (<< 0.5.0),
+ vlc-plugin-a52 (<< 0.5.2-2),
+ vlc-plugin-ogg (<< 0.5.2-2),
+ vlc-plugin-lirc (<< 0.5.2-2),
+ vlc-lirc (<< 0.5.0),
+ vlc-plugin-aa (<< 0.5.2-2),
+ vlc-aa (<< 0.5.0),
+ wxvlc (<< 0.8.5-test3.debian-4),
+ vlc-plugin-alsa (<< 0.8.5-test3.debian-4),
+ vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3)
Conflicts: vlc (<<${Source-Version}),
- vlc-plugin-dvb (<< 0.5.2-2),
- vlc-plugin-xosd (<< 0.5.2-2),
- vlc-plugin-dv (<< 0.5.2-2),
- vlc-plugin-mad (<< 0.5.2-2),
- vlc-mad (<< 0.5.0),
- vlc-plugin-a52 (<< 0.5.2-2),
- vlc-plugin-ogg (<< 0.5.2-2),
- vlc-plugin-lirc (<< 0.5.2-2),
- vlc-lirc (<< 0.5.0),
- vlc-plugin-aa (<< 0.5.2-2),
- vlc-aa (<< 0.5.0),
- wxvlc (<< 0.8.5-test3.debian-4),
- vlc-plugin-alsa (<< 0.8.5-test3.debian-4),
- vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3)
+ vlc-plugin-dvb (<< 0.5.2-2),
+ vlc-plugin-xosd (<< 0.5.2-2),
+ vlc-plugin-dv (<< 0.5.2-2),
+ vlc-plugin-mad (<< 0.5.2-2),
+ vlc-mad (<< 0.5.0),
+ vlc-plugin-a52 (<< 0.5.2-2),
+ vlc-plugin-ogg (<< 0.5.2-2),
+ vlc-plugin-lirc (<< 0.5.2-2),
+ vlc-lirc (<< 0.5.0),
+ vlc-plugin-aa (<< 0.5.2-2),
+ vlc-aa (<< 0.5.0),
+ wxvlc (<< 0.8.5-test3.debian-4),
+ vlc-plugin-alsa (<< 0.8.5-test3.debian-4),
+ vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3)
Provides: mp3-decoder
Description: multimedia player and streamer (without X support)
VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
More information about the pkg-multimedia-commits
mailing list