Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

3 files changed, 3 insertions, 3 deletions

diff --git a/debian/squeeze/applications/amarok/debian/control b/debian/squeeze/applications/amarok/debian/control
index d91477739..cb2097748 100644
--- a/debian/squeeze/applications/amarok/debian/control
+++ b/debian/squeeze/applications/amarok/debian/control
@@ -11,7 +11,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2,
  libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, libpq-dev,
  libvisual-0.4-dev, libsdl1.2-dev,
  libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libmtp-dev, libmp4v2-dev,
- ruby, ruby1.8-dev,
+ ruby, ruby-dev,
  automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://amarok.kde.org
diff --git a/debian/squeeze/applications/kmplayer/debian/control b/debian/squeeze/applications/kmplayer/debian/control
index 5a99316b7..c8de505d0 100644
--- a/debian/squeeze/applications/kmplayer/debian/control
+++ b/debian/squeeze/applications/kmplayer/debian/control
@@ -17,7 +17,7 @@ Depends: ${shlibs:Depends}, kmplayer-base-trinity (= ${binary:Version}), libxine
 Replaces: kmplayer-trinity (<< 4:14.0.0~)
 Breaks: kmplayer-trinity (<< 4:14.0.0~)
 Recommends: kmplayer-plugin-trinity (= ${binary:Version})
-Suggests: ffmpeg, vdr, xawtv, mplayer
+Suggests: libav-tools | ffmpeg, vdr, xawtv, mplayer
 Description: media player for Trinity
  A basic audio/video viewer application for Trinity.
  .
diff --git a/debian/squeeze/applications/soundkonverter/debian/control b/debian/squeeze/applications/soundkonverter/debian/control
index 3cb056aa2..43f0ff793 100644
--- a/debian/squeeze/applications/soundkonverter/debian/control
+++ b/debian/squeeze/applications/soundkonverter/debian/control
@@ -12,7 +12,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: soundkonverter-trinity (<< 4:14.0.0~)
 Breaks: soundkonverter-trinity (<< 4:14.0.0~)
-Recommends: cdda2wav, cdparanoia, faad, ffmpeg, flac, tdemultimedia-tdeio-plugins-trinity, mp3gain, mplayer, mppenc, speex, timidity, vorbis-tools, vorbisgain, wavpack
+Recommends: cdda2wav, cdparanoia, faad, libav-tools | ffmpeg, flac, tdemultimedia-tdeio-plugins-trinity, mp3gain, mplayer, mppenc, speex, timidity, vorbis-tools, vorbisgain, wavpack
 Suggests: soundkonverter-amarok-trinity
 Description: audio converter frontend for Trinity
  soundKonverter is a frontend to various audio converters.