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 Uploaders: Ana Beatriz Guerrero Lopez 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 , Fathi Boudra , Mark Purcell 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 , Mark Purcell 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 diff --git a/debian/lenny/kdeaddons/debian/control b/debian/lenny/kdeaddons/debian/control index 3ed42570f..84a8d3f3e 100644 --- a/debian/lenny/kdeaddons/debian/control +++ b/debian/lenny/kdeaddons/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, kdelibs4-trinity-dev, atlantik-trinity-dev, kdebase-trinity-dev, kdemultimedia-trinity-dev, libkdegames-trinity-dev, libkonq4-trinity-dev, kdepim-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, kdelibs4-trinity-dev, atlantik-trinity-dev, kdebase-trinity-dev, kdemultimedia-trinity-dev, libkdegames-trinity-dev, libkonq4-trinity-dev, kdepim-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: kdeaddons-trinity diff --git a/debian/lenny/kdemultimedia/debian/control b/debian/lenny/kdemultimedia/debian/control index ba22920e3..c4d03be2a 100644 --- a/debian/lenny/kdemultimedia/debian/control +++ b/debian/lenny/kdemultimedia/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, kdelibs4-trinity-dev (>= 4:3.5.10), 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, kdelibs4-trinity-dev (>= 4:3.5.10), 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: kdemultimedia-trinity diff --git a/debian/squeeze/applications/amarok/debian/control b/debian/squeeze/applications/amarok/debian/control index faeaac5ad..ba22d3075 100644 --- a/debian/squeeze/applications/amarok/debian/control +++ b/debian/squeeze/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, 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/squeeze/applications/kaffeine/debian/control b/debian/squeeze/applications/kaffeine/debian/control index f9afe9377..344b488a5 100644 --- a/debian/squeeze/applications/kaffeine/debian/control +++ b/debian/squeeze/applications/kaffeine/debian/control @@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Debian KDE Extras Team , Fathi Boudra , Mark Purcell Build-Depends: cdbs, debhelper (>= 5), quilt, 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/squeeze/applications/kmplayer/debian/control b/debian/squeeze/applications/kmplayer/debian/control index f5737af90..0959f65a4 100644 --- a/debian/squeeze/applications/kmplayer/debian/control +++ b/debian/squeeze/applications/kmplayer/debian/control @@ -6,14 +6,14 @@ XSBC-Original-Maintainer: Debian KDE Extras Team , Mark Purcell Build-Depends: cdbs, debhelper (>= 5), quilt, 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 diff --git a/debian/squeeze/kdeaddons/debian/control b/debian/squeeze/kdeaddons/debian/control index b61aa5029..9af497de2 100644 --- a/debian/squeeze/kdeaddons/debian/control +++ b/debian/squeeze/kdeaddons/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), quilt, autotools-dev, gawk, gettext, kdelibs4-trinity-dev, atlantik-trinity-dev, kdebase-trinity-dev, kdemultimedia-trinity-dev, libkdegames-trinity-dev, libkonq4-trinity-dev, kdepim-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), quilt, autotools-dev, gawk, gettext, kdelibs4-trinity-dev, atlantik-trinity-dev, kdebase-trinity-dev, kdemultimedia-trinity-dev, libkdegames-trinity-dev, libkonq4-trinity-dev, kdepim-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: kdeaddons-trinity diff --git a/debian/squeeze/kdemultimedia/debian/control b/debian/squeeze/kdemultimedia/debian/control index 1b6b312ba..d40bc857f 100644 --- a/debian/squeeze/kdemultimedia/debian/control +++ b/debian/squeeze/kdemultimedia/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), quilt, autotools-dev, cdparanoia, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), 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), quilt, autotools-dev, cdparanoia, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), 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: kdemultimedia-trinity diff --git a/ubuntu/maverick/applications/amarok/debian/control b/ubuntu/maverick/applications/amarok/debian/control index 8a2f56f48..9dff1ba20 100644 --- a/ubuntu/maverick/applications/amarok/debian/control +++ b/ubuntu/maverick/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, 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/ubuntu/maverick/applications/kaffeine/debian/control b/ubuntu/maverick/applications/kaffeine/debian/control index c5f9ef07e..e4e53373c 100644 --- a/ubuntu/maverick/applications/kaffeine/debian/control +++ b/ubuntu/maverick/applications/kaffeine/debian/control @@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Debian KDE Extras Team , Fathi Boudra , Mark Purcell Build-Depends: cdbs, debhelper (>= 5), quilt, 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) Replaces: kaffeine-kde3 (<< 4:3.5.13) Breaks: kaffeine-kde3 (<< 4:3.5.13) Description: versatile media player for TDE diff --git a/ubuntu/maverick/applications/kmplayer/debian/control b/ubuntu/maverick/applications/kmplayer/debian/control index 81c25e375..23366b727 100644 --- a/ubuntu/maverick/applications/kmplayer/debian/control +++ b/ubuntu/maverick/applications/kmplayer/debian/control @@ -6,14 +6,14 @@ XSBC-Original-Maintainer: Debian KDE Extras Team , Mark Purcell Build-Depends: cdbs, debhelper (>= 5), quilt, 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) Replaces: kmplayer-kde3 (<< 4:3.5.13) Breaks: kmplayer-kde3 (<< 4:3.5.13) Recommends: kmplayer-plugin-trinity (= ${binary:Version}) diff --git a/ubuntu/maverick/kdeaddons/debian/control b/ubuntu/maverick/kdeaddons/debian/control index fd19e509b..431e75704 100644 --- a/ubuntu/maverick/kdeaddons/debian/control +++ b/ubuntu/maverick/kdeaddons/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), quilt, autotools-dev, gawk, gettext, kdelibs4-trinity-dev, atlantik-trinity-dev, kdebase-trinity-dev, kdemultimedia-trinity-dev, libkdegames-trinity-dev, libkonq4-trinity-dev, kdepim-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), quilt, autotools-dev, gawk, gettext, kdelibs4-trinity-dev, atlantik-trinity-dev, kdebase-trinity-dev, kdemultimedia-trinity-dev, libkdegames-trinity-dev, libkonq4-trinity-dev, kdepim-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: kdeaddons-trinity diff --git a/ubuntu/maverick/kdemultimedia/debian/control b/ubuntu/maverick/kdemultimedia/debian/control index ab14aa39e..016dff150 100644 --- a/ubuntu/maverick/kdemultimedia/debian/control +++ b/ubuntu/maverick/kdemultimedia/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), quilt, autotools-dev, cdparanoia, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), 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), quilt, autotools-dev, cdparanoia, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), 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: kdemultimedia-trinity