Skip to content

V
vlc-2-2
Commit 348389a1 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* debian/control: Updated the libxosd build dependency to fix a build 

    issue on Debian s390.
parent cc9bc6f2
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
debian/control
View file @ 348389a1
...@@ -2,7 +2,7 @@ Source: vlc ...@@ -2,7 +2,7 @@ Source: vlc
Section: graphics Section: graphics
Priority: optional Priority: optional
Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org> Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org>
Build-Depends: debhelper (>=3.4.4), gettext, fortune-mod, xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>=1.2.2-3.1), libqt3-mt-dev, libqt3-compat-headers, libasound2-dev (>=0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi2-dev, mozilla-dev, libidl0, libglib2.0-0, kdelibs4-dev, dvb-dev, libdv2-dev, libxosd-dev, svgalibg1-dev (>=1.4.0) [i386], libogg-dev, libvorbis-dev, libwxgtk2.4-dev, libdvdplay0-dev (>=1.0.1-2), libdvdread3-dev, libslp-dev, libflac-dev (>=1.1.0), libimlib2-dev, libmatroska-dev (>= 0.5.0-3), libfreetype6-dev Build-Depends: debhelper (>=3.4.4), gettext, fortune-mod, xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>=1.2.2-3.1), libqt3-mt-dev, libqt3-compat-headers, libasound2-dev (>=0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi2-dev, mozilla-dev, libidl0, libglib2.0-0, kdelibs4-dev, dvb-dev, libdv2-dev, libxosd-dev (>= 2.2.4-1.3), svgalibg1-dev (>=1.4.0) [i386], libogg-dev, libvorbis-dev, libwxgtk2.4-dev, libdvdplay0-dev (>=1.0.1-2), libdvdread3-dev, libslp-dev, libflac-dev (>=1.1.0), libimlib2-dev, libmatroska-dev (>= 0.5.0-3), libfreetype6-dev
Build-Conflicts: libmpeg2-dev, libmpeg2-0-dev, libmpeg2-1-dev, libmpeg2-2-dev, libmpeg2-3-dev Build-Conflicts: libmpeg2-dev, libmpeg2-0-dev, libmpeg2-1-dev, libmpeg2-2-dev, libmpeg2-3-dev
Standards-Version: 3.6.1.0 Standards-Version: 3.6.1.0
......
toolbox
View file @ 348389a1
#! /bin/sh #! /bin/sh
## toolbox for the VLC media player ## toolbox for the VLC media player
## $Id: toolbox,v 1.44 2003/07/31 13:06:05 sam Exp $ ## $Id: toolbox,v 1.45 2003/09/15 18:28:47 sam Exp $
## ##
## Authors: Samuel Hocevar <sam@zoy.org> ## Authors: Samuel Hocevar <sam@zoy.org>
...@@ -594,6 +594,7 @@ then ...@@ -594,6 +594,7 @@ then
# libarts1-dev with libarts-dev # libarts1-dev with libarts-dev
# libdvdread3-dev with libdvdread2-dev # libdvdread3-dev with libdvdread2-dev
# libdvdplay0-dev (>=1.0.1-2) with libdvdplay0-dev # libdvdplay0-dev (>=1.0.1-2) with libdvdplay0-dev
# libxosd-dev (>=2.2.4-1.3) with libxosd-dev
# remove libwxgtk2.4-dev # remove libwxgtk2.4-dev
# libflac-dev # libflac-dev
# libidl0 (workaround for mozilla-dev's bad deps) # libidl0 (workaround for mozilla-dev's bad deps)
...@@ -611,6 +612,7 @@ then ...@@ -611,6 +612,7 @@ then
-e 's/libarts[0-9]*-dev/libarts-dev/' \ -e 's/libarts[0-9]*-dev/libarts-dev/' \
-e 's/libdvdread[0-9]*-dev/libdvdread2-dev/' \ -e 's/libdvdread[0-9]*-dev/libdvdread2-dev/' \
-e 's/, libdvdplay0-dev[^,]*/, libdvdplay0-dev/' \ -e 's/, libdvdplay0-dev[^,]*/, libdvdplay0-dev/' \
-e 's/, libxosd-dev[^,]*/, libxosd-dev/' \
-e 's/, libwx[^,]*//' \ -e 's/, libwx[^,]*//' \
-e '/Package: wxvlc/,/^ *$/d' \ -e '/Package: wxvlc/,/^ *$/d' \
-e 's/, libflac-dev[^,]*//' \ -e 's/, libflac-dev[^,]*//' \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment