summaryrefslogtreecommitdiffstats
path: root/ubuntu/precise/applications
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-12-27 13:53:23 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2013-12-27 13:53:23 +0100
commit5ffeb7a6799ee097cb794803e60116821102f305 (patch)
tree732807bb9f381d49a07844ab3af3354a4846fedd /ubuntu/precise/applications
parentbd2480c3dc402786dae7635394dfb6253b3e1061 (diff)
parent4de18bf3203e02dfd63013f8b89c64a5c0071cd3 (diff)
downloadtde-packaging-5ffeb7a6799ee097cb794803e60116821102f305.tar.gz
tde-packaging-5ffeb7a6799ee097cb794803e60116821102f305.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/precise/applications')
-rw-r--r--ubuntu/precise/applications/kmplayer/debian/control2
-rw-r--r--ubuntu/precise/applications/soundkonverter/debian/control2
2 files changed, 2 insertions, 2 deletions
diff --git a/ubuntu/precise/applications/kmplayer/debian/control b/ubuntu/precise/applications/kmplayer/debian/control
index 7b87b17e9..f09dd1f1e 100644
--- a/ubuntu/precise/applications/kmplayer/debian/control
+++ b/ubuntu/precise/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/precise/applications/soundkonverter/debian/control b/ubuntu/precise/applications/soundkonverter/debian/control
index d52f20570..f322727a3 100644
--- a/ubuntu/precise/applications/soundkonverter/debian/control
+++ b/ubuntu/precise/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.