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

6 files changed, 14 insertions, 14 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.
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
diff --git a/debian/wheezy/tdebindings/debian/libkorundum0-ruby1.8-trinity.install b/debian/wheezy/tdebindings/debian/libkorundum0-ruby1.8-trinity.install
index c250f2beb..ebec44d37 100644
--- a/debian/wheezy/tdebindings/debian/libkorundum0-ruby1.8-trinity.install
+++ b/debian/wheezy/tdebindings/debian/libkorundum0-ruby1.8-trinity.install
@@ -3,10 +3,10 @@ debian/tmp/opt/trinity/bin/rbkdeapi
 debian/tmp/opt/trinity/bin/krubyinit
 debian/tmp/opt/trinity/bin/rbtdeconfig_compiler
 
-debian/tmp/opt/trinity/lib/ruby/1.9.1/Korundum.rb
-debian/tmp/opt/trinity/lib/ruby/1.9.1/KDE/korundum.rb
+debian/tmp/opt/trinity/lib/ruby/*/Korundum.rb
+debian/tmp/opt/trinity/lib/ruby/*/KDE/korundum.rb
 
-debian/tmp/opt/trinity/lib/ruby/1.9.1/*/korundum.so*
-debian/tmp/opt/trinity/lib/ruby/1.9.1/*/korundum.la
+debian/tmp/opt/trinity/lib/ruby/*/*/korundum.so*
+debian/tmp/opt/trinity/lib/ruby/*/*/korundum.la
 
 korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby1.8
diff --git a/debian/wheezy/tdebindings/debian/libqt0-ruby1.8-trinity.install b/debian/wheezy/tdebindings/debian/libqt0-ruby1.8-trinity.install
index dc71eead5..2f075b24e 100644
--- a/debian/wheezy/tdebindings/debian/libqt0-ruby1.8-trinity.install
+++ b/debian/wheezy/tdebindings/debian/libqt0-ruby1.8-trinity.install
@@ -3,13 +3,13 @@ debian/tmp/opt/trinity/bin/rbqtapi
 debian/tmp/opt/trinity/bin/rbuic
 debian/tmp/opt/trinity/bin/qtrubyinit
 
-debian/tmp/opt/trinity/lib/ruby/1.9.1/Qt/qtruby.rb
-debian/tmp/opt/trinity/lib/ruby/1.9.1/Qt.rb
+debian/tmp/opt/trinity/lib/ruby/*/Qt/qtruby.rb
+debian/tmp/opt/trinity/lib/ruby/*/Qt.rb
 
-debian/tmp/opt/trinity/lib/ruby/1.9.1/*/qtruby.so*
-debian/tmp/opt/trinity/lib/ruby/1.9.1/*/qtruby.la
+debian/tmp/opt/trinity/lib/ruby/*/*/qtruby.so*
+debian/tmp/opt/trinity/lib/ruby/*/*/qtruby.la
 
-debian/tmp/opt/trinity/lib/ruby/1.9.1/*/tqui.so*
-debian/tmp/opt/trinity/lib/ruby/1.9.1/*/tqui.la
+debian/tmp/opt/trinity/lib/ruby/*/*/tqui.so*
+debian/tmp/opt/trinity/lib/ruby/*/*/tqui.la
 
 qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby1.8