summaryrefslogtreecommitdiffstats
path: root/ubuntu/raring
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-12-26 16:08:33 +0100
committerSlávek Banko <slavek.banko@axis.cz>2013-12-26 16:08:33 +0100
commit4de18bf3203e02dfd63013f8b89c64a5c0071cd3 (patch)
treeec52011ce20b4ce70f34fdcf091078ae216ee1ef /ubuntu/raring
parent7630e9320b102582a59a1deead8ca9718e31d0ac (diff)
downloadtde-packaging-4de18bf3203e02dfd63013f8b89c64a5c0071cd3.tar.gz
tde-packaging-4de18bf3203e02dfd63013f8b89c64a5c0071cd3.zip
Add libav-tools as alternate dependency on Debian and Ubuntu
Diffstat (limited to 'ubuntu/raring')
-rw-r--r--ubuntu/raring/applications/kmplayer/debian/control2
-rw-r--r--ubuntu/raring/applications/soundkonverter/debian/control2
-rw-r--r--ubuntu/raring/libraries/mlt/debian/control2
3 files changed, 3 insertions, 3 deletions
diff --git a/ubuntu/raring/applications/kmplayer/debian/control b/ubuntu/raring/applications/kmplayer/debian/control
index 7b87b17e9..f09dd1f1e 100644
--- a/ubuntu/raring/applications/kmplayer/debian/control
+++ b/ubuntu/raring/applications/kmplayer/debian/control
@@ -17,7 +17,7 @@ Depends: ${shlibs:Depends}, kmplayer-base-trinity (= ${binary:Version}), libxine
Replaces: kmplayer-kde3 (<< 4:14.0.0~), kmplayer-trinity (<< 4:14.0.0~)
Breaks: kmplayer-kde3 (<< 4:14.0.0~), 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/ubuntu/raring/applications/soundkonverter/debian/control b/ubuntu/raring/applications/soundkonverter/debian/control
index d52f20570..f322727a3 100644
--- a/ubuntu/raring/applications/soundkonverter/debian/control
+++ b/ubuntu/raring/applications/soundkonverter/debian/control
@@ -12,7 +12,7 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: soundkonverter-kde3 (<< 4:14.0.0~), soundkonverter-trinity (<< 4:14.0.0~)
Breaks: soundkonverter-kde3 (<< 4:14.0.0~), 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/ubuntu/raring/libraries/mlt/debian/control b/ubuntu/raring/libraries/mlt/debian/control
index 9df702f3a..6b29f3cf8 100644
--- a/ubuntu/raring/libraries/mlt/debian/control
+++ b/ubuntu/raring/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