r899 - in /videolan/vlc/debian: changelog control

xtophe-guest at users.alioth.debian.org xtophe-guest at users.alioth.debian.org
Thu Oct 18 22:51:03 UTC 2007


Author: xtophe-guest
Date: Thu Oct 18 22:51:03 2007
New Revision: 899

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=899
Log:
- Wrap depends
- the makefiles have been fixed. we can build if libvlc0 is present

Modified:
    videolan/vlc/debian/changelog
    videolan/vlc/debian/control

Modified: videolan/vlc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/changelog?rev=899&op=diff
==============================================================================
--- videolan/vlc/debian/changelog (original)
+++ videolan/vlc/debian/changelog Thu Oct 18 22:51:03 2007
@@ -19,17 +19,15 @@
     + store libvlc.a not in src/ to avoid the linker using it.
     + enable-fast-install to have a real vlc executable
     +enable jack and v4l2 modules
-  * control, vlc-plugin-jack.*
+  * control
+    + wrap Depends  
     + new vlc-plugin-jack pkg with jack audio_output and access modules
       (fix #402252)
-
- -- Christophe Mutricy <xtophe at videolan.org>  Wed, 17 Oct 2007 22:57:00 +0100
-
-vlc (0.9.0-svn1-3) unstable; urgency=low
-
-  * Build-conflicts against libvlc0 to workaround ld/libtool bug. 
-
- -- Christophe Mutricy <xtophe at videolan.org>  Mon, 02 Jul 2007 23:01:27 +0100
+  * vlc-plugin-jack.*
+    + new vlc-plugin-jack pkg with jack audio_output and access modules
+      (fix #402252)
+
+ -- Christophe Mutricy <xtophe at videolan.org>  Thu, 18 Oct 2007 21:32:09 +0100
 
 vlc (0.9.0-svn1-2) unstable; urgency=low
 

Modified: videolan/vlc/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/control?rev=899&op=diff
==============================================================================
--- videolan/vlc/debian/control (original)
+++ videolan/vlc/debian/control Thu Oct 18 22:51:03 2007
@@ -3,8 +3,81 @@
 Priority: optional
 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, linux-libc-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], 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, 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
+Build-Depends: dpkg-dev (>= 1.13.19),
+  debhelper (>= 5.0),
+  dh-buildinfo,
+  quilt,
+  nasm,
+  yasm [amd64 kfreebsd-amd64],
+  gettext,
+  linux-libc-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+  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,
+  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.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/videolan/vlc/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/
@@ -12,11 +85,40 @@
 Package: vlc
 Section: graphics
 Architecture: any
-Depends: vlc-nox (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ttf-dejavu
+Depends: vlc-nox (= ${binary:Version}), 
+  ${shlibs:Depends}, 
+  ${misc:Depends},
+  ttf-dejavu
 Recommends: videolan-doc
 Suggests: mozilla-plugin-vlc
-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)
-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)
+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)
+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)
 Provides: mp3-decoder
 Description: multimedia player and streamer
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
@@ -38,7 +140,9 @@
 Package: vlc-dbg
 Section: graphics
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, vlc (= ${source:Version})
+Depends: ${shlibs:Depends},
+  ${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,
@@ -51,8 +155,36 @@
 Section: net
 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)
-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)
+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)
+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)
 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