summaryrefslogtreecommitdiffstats
path: root/debian/wheezy/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 /debian/wheezy/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 'debian/wheezy/applications')
-rw-r--r--debian/wheezy/applications/kftpgrabber/debian/changelog2
-rw-r--r--debian/wheezy/applications/kmplayer/debian/control2
-rw-r--r--debian/wheezy/applications/soundkonverter/debian/control2
3 files changed, 3 insertions, 3 deletions
diff --git a/debian/wheezy/applications/kftpgrabber/debian/changelog b/debian/wheezy/applications/kftpgrabber/debian/changelog
index 448636493..9db00359a 100644
--- a/debian/wheezy/applications/kftpgrabber/debian/changelog
+++ b/debian/wheezy/applications/kftpgrabber/debian/changelog
@@ -2,7 +2,7 @@ kftpgrabber-trinity (0.8.1-2) unstable; urgency=low
* Initial Release for TDE
- -- Slávek Banko <slavek.banko@axis.cz> Fri, 26 Jul 2013 05:12:03 +0200
+ -- Slávek Banko <slavek.banko@axis.cz> Fri, 26 Jul 2013 08:28:38 +0200
kftpgrabber (0.8.1-2) unstable; urgency=low
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.