From 94cd325ed1d441804dfcdce60125922a3359eb25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 9 Jan 2013 20:11:09 +0100 Subject: Switch to use xine 1.2, if available on Debian and Ubuntu --- ubuntu/precise/applications/amarok/debian/control | 2 +- ubuntu/precise/applications/kaffeine/debian/control | 4 ++-- ubuntu/precise/applications/kmplayer/debian/control | 4 ++-- ubuntu/precise/tdeaddons/debian/control | 2 +- ubuntu/precise/tdemultimedia/debian/control | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'ubuntu/precise') diff --git a/ubuntu/precise/applications/amarok/debian/control b/ubuntu/precise/applications/amarok/debian/control index fab0c6986..2b28b68d1 100644 --- a/ubuntu/precise/applications/amarok/debian/control +++ b/ubuntu/precise/applications/amarok/debian/control @@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Modestas Vainius Uploaders: Ana Beatriz Guerrero Lopez Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2, tdelibs4-trinity-dev, - libxine-dev, libdbus-tqt-1-dev, + libxine2-dev | libxine-dev, libdbus-tqt-1-dev, libtag1-dev, libsqlite3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, libpq-dev, libvisual-0.4-dev, libsdl1.2-dev, diff --git a/ubuntu/precise/applications/kaffeine/debian/control b/ubuntu/precise/applications/kaffeine/debian/control index 25063f3ba..f91dd770e 100644 --- a/ubuntu/precise/applications/kaffeine/debian/control +++ b/ubuntu/precise/applications/kaffeine/debian/control @@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Debian KDE Extras Team , Fathi Boudra , Mark Purcell Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, - libcdparanoia0-dev, libogg-dev, libxine-dev (>= 1.1.7), libxcb1-dev, + libcdparanoia0-dev, libogg-dev, libxine2-dev | libxine-dev (>= 1.1.7), libxcb1-dev, libxtst-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libcdio-cdda-dev, libcdio-paranoia-dev, automake, autoconf, libtool, libltdl-dev @@ -14,7 +14,7 @@ Standards-Version: 3.8.4 Package: kaffeine-trinity Architecture: any -Depends: ${shlibs:Depends}, hdparm +Depends: ${shlibs:Depends}, hdparm, libxine2-x | libxine1-x (<< 1.1.20) | libxine1 (<< 1.1.8-2) Replaces: kaffeine-trinity (<< 4:14.0.0) Breaks: kaffeine-trinity (<< 4:14.0.0) Description: versatile media player for TDE diff --git a/ubuntu/precise/applications/kmplayer/debian/control b/ubuntu/precise/applications/kmplayer/debian/control index d271ebf1a..846879cde 100644 --- a/ubuntu/precise/applications/kmplayer/debian/control +++ b/ubuntu/precise/applications/kmplayer/debian/control @@ -6,14 +6,14 @@ XSBC-Original-Maintainer: Debian KDE Extras Team , Mark Purcell Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libdbus-tqt-1-dev, - libgstreamer-plugins-base0.10-dev, libgtk2.0-dev, libxine-dev, libxv-dev, docbook2x, + libgstreamer-plugins-base0.10-dev, libgtk2.0-dev, libxine2-dev | libxine-dev, libxv-dev, docbook2x, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://kmplayer.kde.org Package: kmplayer-trinity Architecture: any -Depends: ${shlibs:Depends}, kmplayer-base-trinity (= ${binary:Version}), libxine1-x | libxine1 (<< 1.1.8-2) +Depends: ${shlibs:Depends}, kmplayer-base-trinity (= ${binary:Version}), libxine2-x | libxine1-x (<< 1.1.20) | libxine1 (<< 1.1.8-2) Replaces: kmplayer-trinity (<< 4:14.0.0) Breaks: kmplayer-trinity (<< 4:14.0.0) Recommends: kmplayer-plugin-trinity (= ${binary:Version}) diff --git a/ubuntu/precise/tdeaddons/debian/control b/ubuntu/precise/tdeaddons/debian/control index ee1a9b0e6..52e496189 100644 --- a/ubuntu/precise/tdeaddons/debian/control +++ b/ubuntu/precise/tdeaddons/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, libdb4.8++-dev | libdb++-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb4.8++-dev | libdb++-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: tdeaddons-trinity diff --git a/ubuntu/precise/tdemultimedia/debian/control b/ubuntu/precise/tdemultimedia/debian/control index 933f4d9d8..cf85ef6b0 100644 --- a/ubuntu/precise/tdemultimedia/debian/control +++ b/ubuntu/precise/tdemultimedia/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin , Fathi Boudra , Sune Vuorela -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, cdparanoia, gawk, gettext, tdelibs4-trinity-dev, libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, cdparanoia, gawk, gettext, tdelibs4-trinity-dev, libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: tdemultimedia-trinity -- cgit v1.2.1