Add libav-tools as alternate dependency on Debian and Ubuntu

9 files changed, 9 insertions, 9 deletions

diff --git a/debian/lenny/applications/kmplayer/debian/control b/debian/lenny/applications/kmplayer/debian/control
index 5a99316b7..c8de505d0 100644
--- a/debian/lenny/applications/kmplayer/debian/control
+++ b/debian/lenny/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/lenny/applications/soundkonverter/debian/control b/debian/lenny/applications/soundkonverter/debian/control
index 3cb056aa2..43f0ff793 100644
--- a/debian/lenny/applications/soundkonverter/debian/control
+++ b/debian/lenny/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.
diff --git a/debian/lenny/libraries/mlt/debian/control b/debian/lenny/libraries/mlt/debian/control
index b2ec7b6f2..94b75cd55 100644
--- a/debian/lenny/libraries/mlt/debian/control
+++ b/debian/lenny/libraries/mlt/debian/control
@@ -7,7 +7,7 @@ Homepage: http://mlt.sourceforge.net/
 Standards-Version: 3.8.3
 Build-Depends: cdbs, debhelper (>= 5), libdv4-dev, libquicktime-dev (>= 2:1.0.0),
  libvorbis-dev, libsdl-dev | libsdl1.2-dev, libgtk2.0-dev, libjack-dev, quilt,
- libsamplerate-dev, libmad0-dev, tdelibs14-trinity-dev, imagemagick, ffmpeg, libflac-dev,
+ libsamplerate-dev, libmad0-dev, tdelibs14-trinity-dev, imagemagick, libav-tools | ffmpeg, libflac-dev,
  libavcodec-dev, libxml2-dev, ladspa-sdk, libavutil-dev, libxcursor-dev,
  libxinerama-dev, libxrandr-dev, libxrender-dev, libavformat-dev,
  libswscale-dev, libasound2-dev, libsox-dev
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.
diff --git a/debian/squeeze/libraries/mlt/debian/control b/debian/squeeze/libraries/mlt/debian/control
index b2ec7b6f2..94b75cd55 100644
--- a/debian/squeeze/libraries/mlt/debian/control
+++ b/debian/squeeze/libraries/mlt/debian/control
@@ -7,7 +7,7 @@ Homepage: http://mlt.sourceforge.net/
 Standards-Version: 3.8.3
 Build-Depends: cdbs, debhelper (>= 5), libdv4-dev, libquicktime-dev (>= 2:1.0.0),
  libvorbis-dev, libsdl-dev | libsdl1.2-dev, libgtk2.0-dev, libjack-dev, quilt,
- libsamplerate-dev, libmad0-dev, tdelibs14-trinity-dev, imagemagick, ffmpeg, libflac-dev,
+ libsamplerate-dev, libmad0-dev, tdelibs14-trinity-dev, imagemagick, libav-tools | ffmpeg, libflac-dev,
  libavcodec-dev, libxml2-dev, ladspa-sdk, libavutil-dev, libxcursor-dev,
  libxinerama-dev, libxrandr-dev, libxrender-dev, libavformat-dev,
  libswscale-dev, libasound2-dev, libsox-dev
diff --git a/debian/wheezy/applications/kmplayer/debian/control b/debian/wheezy/applications/kmplayer/debian/control
index 5a99316b7..c8de505d0 100644
--- a/debian/wheezy/applications/kmplayer/debian/control
+++ b/debian/wheezy/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/wheezy/applications/soundkonverter/debian/control b/debian/wheezy/applications/soundkonverter/debian/control
index 3cb056aa2..43f0ff793 100644
--- a/debian/wheezy/applications/soundkonverter/debian/control
+++ b/debian/wheezy/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.
diff --git a/debian/wheezy/libraries/mlt/debian/control b/debian/wheezy/libraries/mlt/debian/control
index b2ec7b6f2..94b75cd55 100644
--- a/debian/wheezy/libraries/mlt/debian/control
+++ b/debian/wheezy/libraries/mlt/debian/control
@@ -7,7 +7,7 @@ Homepage: http://mlt.sourceforge.net/
 Standards-Version: 3.8.3
 Build-Depends: cdbs, debhelper (>= 5), libdv4-dev, libquicktime-dev (>= 2:1.0.0),
  libvorbis-dev, libsdl-dev | libsdl1.2-dev, libgtk2.0-dev, libjack-dev, quilt,
- libsamplerate-dev, libmad0-dev, tdelibs14-trinity-dev, imagemagick, ffmpeg, libflac-dev,
+ libsamplerate-dev, libmad0-dev, tdelibs14-trinity-dev, imagemagick, libav-tools | ffmpeg, libflac-dev,
  libavcodec-dev, libxml2-dev, ladspa-sdk, libavutil-dev, libxcursor-dev,
  libxinerama-dev, libxrandr-dev, libxrender-dev, libavformat-dev,
  libswscale-dev, libasound2-dev, libsox-dev