Switch to use xine 1.2, if available on Debian and Ubuntu

(cherry picked from commit 94cd325ed1d441804dfcdce60125922a3359eb25)

3 files changed, 5 insertions, 5 deletions

diff --git a/debian/lenny/applications/amarok/debian/control b/debian/lenny/applications/amarok/debian/control
index faeaac5ad..ba22d3075 100644
--- a/debian/lenny/applications/amarok/debian/control
+++ b/debian/lenny/applications/amarok/debian/control
@@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Modestas Vainius <modestas@vainius.eu>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>
 Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2,
  kdelibs4-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/debian/lenny/applications/kaffeine/debian/control b/debian/lenny/applications/kaffeine/debian/control
index 8f7b568f2..2c3bdce06 100644
--- a/debian/lenny/applications/kaffeine/debian/control
+++ b/debian/lenny/applications/kaffeine/debian/control
@@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.de
 Uploaders: Riku Voipio <riku.voipio@iki.fi>, Fathi Boudra <fboudra@free.fr>,
  Mark Purcell <msp@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), kdelibs4-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)
 Description: versatile media player for TDE
  Kaffeine is a media player for KDE. While it supports multiple player
  engines, its default engine is Xine, giving Kaffeine a wide variety of
diff --git a/debian/lenny/applications/kmplayer/debian/control b/debian/lenny/applications/kmplayer/debian/control
index 1b45021c4..ae42b94a5 100644
--- a/debian/lenny/applications/kmplayer/debian/control
+++ b/debian/lenny/applications/kmplayer/debian/control
@@ -6,14 +6,14 @@ XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.de
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), kdelibs4-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)
 Recommends: kmplayer-plugin-trinity (= ${binary:Version})
 Suggests: ffmpeg, vdr, xawtv, mplayer
 Description: media player for Trinity