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

57 files changed, 87 insertions, 95 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/amarok/debian/control b/debian/squeeze/applications/amarok/debian/control
index d91477739..cb2097748 100644
--- a/debian/squeeze/applications/amarok/debian/control
+++ b/debian/squeeze/applications/amarok/debian/control
@@ -11,7 +11,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2,
  libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, libpq-dev,
  libvisual-0.4-dev, libsdl1.2-dev,
  libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libmtp-dev, libmp4v2-dev,
- ruby, ruby1.8-dev,
+ ruby, ruby-dev,
  automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://amarok.kde.org
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/dependencies/libart-lgpl/debian/control b/debian/squeeze/dependencies/libart-lgpl/debian/control
index 9a8bb0e78..f4b2021c4 100644
--- a/debian/squeeze/dependencies/libart-lgpl/debian/control
+++ b/debian/squeeze/dependencies/libart-lgpl/debian/control
@@ -17,9 +17,11 @@ Build-Depends: debhelper (>= 5), quilt,
 
 Package: libart-2.0-2
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libart-2.0-2 (<< 4:14.0.0~)
 Breaks: libart-2.0-2 (<< 4:14.0.0~)
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Description: Library of functions for 2D graphics - runtime files
diff --git a/debian/squeeze/dependencies/libart-lgpl/debian/control.in b/debian/squeeze/dependencies/libart-lgpl/debian/control.in
index 4dc153450..e0b3f3a97 100644
--- a/debian/squeeze/dependencies/libart-lgpl/debian/control.in
+++ b/debian/squeeze/dependencies/libart-lgpl/debian/control.in
@@ -12,7 +12,9 @@ Build-Depends: debhelper (>= 5), quilt,
 
 Package: libart-2.0-2
 Architecture: any
+Multi-Arch: same
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Description: Library of functions for 2D graphics - runtime files
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/squeeze/tdebindings/debian/libkorundum0-ruby1.8-trinity.install b/debian/squeeze/tdebindings/debian/libkorundum0-ruby1.8-trinity.install
index fba8f1a13..ebec44d37 100644
--- a/debian/squeeze/tdebindings/debian/libkorundum0-ruby1.8-trinity.install
+++ b/debian/squeeze/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.8/Korundum.rb
-debian/tmp/opt/trinity/lib/ruby/1.8/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.8/*/korundum.so*
-debian/tmp/opt/trinity/lib/ruby/1.8/*/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/squeeze/tdebindings/debian/libqt0-ruby1.8-trinity.install b/debian/squeeze/tdebindings/debian/libqt0-ruby1.8-trinity.install
index 60f10d40e..2f075b24e 100644
--- a/debian/squeeze/tdebindings/debian/libqt0-ruby1.8-trinity.install
+++ b/debian/squeeze/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.8/Qt/qtruby.rb
-debian/tmp/opt/trinity/lib/ruby/1.8/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.8/*/qtruby.so*
-debian/tmp/opt/trinity/lib/ruby/1.8/*/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.8/*/tqui.so*
-debian/tmp/opt/trinity/lib/ruby/1.8/*/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
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
diff --git a/ubuntu/maverick/applications/amarok/debian/control b/ubuntu/maverick/applications/amarok/debian/control
index abf33fcc6..736d76a5b 100644
--- a/ubuntu/maverick/applications/amarok/debian/control
+++ b/ubuntu/maverick/applications/amarok/debian/control
@@ -11,7 +11,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2,
  libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, libpq-dev,
  libvisual-0.4-dev, libsdl1.2-dev,
  libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libmtp-dev, libmp4v2-dev,
- ruby, ruby1.8-dev,
+ ruby, ruby-dev,
  automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://amarok.kde.org
diff --git a/ubuntu/maverick/applications/kmplayer/debian/control b/ubuntu/maverick/applications/kmplayer/debian/control
index 7b87b17e9..f09dd1f1e 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/control
+++ b/ubuntu/maverick/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/maverick/applications/soundkonverter/debian/control b/ubuntu/maverick/applications/soundkonverter/debian/control
index d52f20570..f322727a3 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/control
+++ b/ubuntu/maverick/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/maverick/defaultsettings/redmond-default-settings-ii/debian/control b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control
index 3db6ae218..5150015e3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.8.4
 Package: redmond-default-settings-ii-trinity
 Architecture: all
 Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, tqca-tls, readahead, screen, smbclient, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity
-Recommends: firefox, thunderbird, synaptic, tdeio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikamdesktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tde-guidance-powermanager-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic, ttf-kochi-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, x-ttcidfont-conf, gtk3-tqt-engine-trinity
+Recommends: firefox, thunderbird, synaptic, tdeio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikamdesktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tde-guidance-powermanager-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic, ttf-kochi-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, gtk3-tqt-engine-trinity
 Suggests: apport-gtk, hplip-gui
 Conflicts: kubuntu-default-settings-trinity, kubuntu-default-settings
 Description: Redmond II default settings and artwork for the Kubuntu Trinity desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control
index 60f9ff1cc..16c5c2cb2 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.8.4
 Package: redmond-default-settings-trinity
 Architecture: all
 Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, tqca-tls, readahead, screen, smbclient, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity
-Recommends: firefox, thunderbird, synaptic, tdeio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikamdesktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tde-guidance-powermanager-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic, ttf-kochi-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, x-ttcidfont-conf, gtk3-tqt-engine-trinity
+Recommends: firefox, thunderbird, synaptic, tdeio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikamdesktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tde-guidance-powermanager-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic, ttf-kochi-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, gtk3-tqt-engine-trinity
 Suggests: apport-gtk, hplip-gui
 Conflicts: kubuntu-default-settings-trinity, kubuntu-default-settings
 Description: Redmond default settings and artwork for the Kubuntu Trinity desktop
diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/control b/ubuntu/maverick/dependencies/libart-lgpl/debian/control
index ffcb69b07..2de98fddf 100644
--- a/ubuntu/maverick/dependencies/libart-lgpl/debian/control
+++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/control
@@ -17,9 +17,11 @@ Build-Depends: debhelper (>= 5), quilt,
 
 Package: libart-2.0-2
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libart-2.0-2 (<< 4:14.0.0~)
 Breaks: libart-2.0-2 (<< 4:14.0.0~)
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Description: Library of functions for 2D graphics - runtime files
diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/control.in b/ubuntu/maverick/dependencies/libart-lgpl/debian/control.in
index 4dc153450..e0b3f3a97 100644
--- a/ubuntu/maverick/dependencies/libart-lgpl/debian/control.in
+++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/control.in
@@ -12,7 +12,9 @@ Build-Depends: debhelper (>= 5), quilt,
 
 Package: libart-2.0-2
 Architecture: any
+Multi-Arch: same
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Description: Library of functions for 2D graphics - runtime files
diff --git a/ubuntu/maverick/libraries/mlt/debian/control b/ubuntu/maverick/libraries/mlt/debian/control
index 9df702f3a..6b29f3cf8 100644
--- a/ubuntu/maverick/libraries/mlt/debian/control
+++ b/ubuntu/maverick/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/ubuntu/maverick/metapackages/kubuntu-meta/debian/control b/ubuntu/maverick/metapackages/kubuntu-meta/debian/control
index 36eab07c5..add6683b2 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/control
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 4), germinate (>= 0.38)
 
 Package: kubuntu-desktop-trinity
 Architecture: any
-Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, powermanagement-interface, readahead, screen, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, x-ttcidfont-conf, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine
+Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, powermanagement-interface, readahead, screen, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine
 Recommends: tdeio-apt-trinity, tde-guidance-powermanager-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikam-trinity, desktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus-trinity, openoffice.org-calc, openoffice.org-impress, openoffice.org-trinity, openoffice.org-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic, ttf-kochi-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, smbclient, network-manager-tde-trinity | network-manager-gnome, plymouth-theme-kubuntu-logo-trinity
 Suggests: apport-gtk, hplip-gui
 Description: Kubuntu desktop system, TDE version
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop b/ubuntu/maverick/metapackages/kubuntu-meta/desktop
index 5e6b2bcac..b1016a157 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop
@@ -94,7 +94,6 @@ Packages used for X preconfiguration are just Recommends; removing them after in
 
 Fonts:
 
- * x-ttcidfont-conf
  * ttf-bitstream-vera
  * ttf-dejavu                    # includes characters missing in Vera
  * ttf-freefont
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-amd64 b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-amd64
index cdd7cceea..3e5fba0d9 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-amd64
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-amd64
@@ -76,7 +76,6 @@ ttf-freefont
 unzip
 usplash
 vorbis-tools
-x-ttcidfont-conf
 xdg-user-dirs
 xkb-data
 xorg
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-hppa b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-hppa
index e28c15bc0..030d93618 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-hppa
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-hppa
@@ -73,7 +73,6 @@ ttf-freefont
 unzip
 usplash
 vorbis-tools
-x-ttcidfont-conf
 xdg-user-dirs
 xkb-data
 xorg
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-i386 b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-i386
index 0aa597238..52cd6a70e 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-i386
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-i386
@@ -77,7 +77,6 @@ ttf-freefont
 unzip
 usplash
 vorbis-tools
-x-ttcidfont-conf
 xdg-user-dirs
 xkb-data
 xorg
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-ia64 b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-ia64
index 8b7c1e151..f24d7e4cf 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-ia64
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-ia64
@@ -77,7 +77,6 @@ ttf-freefont
 unzip
 usplash
 vorbis-tools
-x-ttcidfont-conf
 xdg-user-dirs
 xkb-data
 xorg
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-lpia b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-lpia
index 9795087f8..7c8954570 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-lpia
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-lpia
@@ -75,7 +75,6 @@ ttf-freefont
 unzip
 usplash
 vorbis-tools
-x-ttcidfont-conf
 xdg-user-dirs
 xkb-data
 xorg
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-powerpc b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-powerpc
index c33ba4840..1314826f1 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-powerpc
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-powerpc
@@ -75,7 +75,6 @@ ttf-freefont
 unzip
 usplash
 vorbis-tools
-x-ttcidfont-conf
 xdg-user-dirs
 xkb-data
 xorg
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-sparc b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-sparc
index e28c15bc0..030d93618 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-sparc
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-sparc
@@ -73,7 +73,6 @@ ttf-freefont
 unzip
 usplash
 vorbis-tools
-x-ttcidfont-conf
 xdg-user-dirs
 xkb-data
 xorg
diff --git a/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby1.8-trinity.install b/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby1.8-trinity.install
index fba8f1a13..ebec44d37 100644
--- a/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby1.8-trinity.install
+++ b/ubuntu/maverick/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.8/Korundum.rb
-debian/tmp/opt/trinity/lib/ruby/1.8/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.8/*/korundum.so*
-debian/tmp/opt/trinity/lib/ruby/1.8/*/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/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.install b/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.install
index 60f10d40e..2f075b24e 100644
--- a/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.install
+++ b/ubuntu/maverick/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.8/Qt/qtruby.rb
-debian/tmp/opt/trinity/lib/ruby/1.8/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.8/*/qtruby.so*
-debian/tmp/opt/trinity/lib/ruby/1.8/*/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.8/*/tqui.so*
-debian/tmp/opt/trinity/lib/ruby/1.8/*/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
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.
diff --git a/ubuntu/precise/libraries/mlt/debian/control b/ubuntu/precise/libraries/mlt/debian/control
index 9df702f3a..6b29f3cf8 100644
--- a/ubuntu/precise/libraries/mlt/debian/control
+++ b/ubuntu/precise/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/ubuntu/precise/metapackages/kubuntu-meta/debian/control b/ubuntu/precise/metapackages/kubuntu-meta/debian/control
index 36eab07c5..add6683b2 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/control
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 4), germinate (>= 0.38)
 
 Package: kubuntu-desktop-trinity
 Architecture: any
-Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, powermanagement-interface, readahead, screen, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, x-ttcidfont-conf, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine
+Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, powermanagement-interface, readahead, screen, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine
 Recommends: tdeio-apt-trinity, tde-guidance-powermanager-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikam-trinity, desktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus-trinity, openoffice.org-calc, openoffice.org-impress, openoffice.org-trinity, openoffice.org-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic, ttf-kochi-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, smbclient, network-manager-tde-trinity | network-manager-gnome, plymouth-theme-kubuntu-logo-trinity
 Suggests: apport-gtk, hplip-gui
 Description: Kubuntu desktop system, TDE version
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop b/ubuntu/precise/metapackages/kubuntu-meta/desktop
index 5e6b2bcac..b1016a157 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/desktop
+++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop
@@ -94,7 +94,6 @@ Packages used for X preconfiguration are just Recommends; removing them after in
 
 Fonts:
 
- * x-ttcidfont-conf
  * ttf-bitstream-vera
  * ttf-dejavu                    # includes characters missing in Vera
  * ttf-freefont
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64 b/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64
index cdd7cceea..3e5fba0d9 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64
+++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64
@@ -76,7 +76,6 @@ ttf-freefont
 unzip
 usplash
 vorbis-tools
-x-ttcidfont-conf
 xdg-user-dirs
 xkb-data
 xorg
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa b/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa
index e28c15bc0..030d93618 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa
+++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa
@@ -73,7 +73,6 @@ ttf-freefont
 unzip
 usplash
 vorbis-tools
-x-ttcidfont-conf
 xdg-user-dirs
 xkb-data
 xorg
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386 b/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386
index 0aa597238..52cd6a70e 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386
+++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386
@@ -77,7 +77,6 @@ ttf-freefont
 unzip
 usplash
 vorbis-tools
-x-ttcidfont-conf
 xdg-user-dirs
 xkb-data
 xorg
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64 b/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64
index 8b7c1e151..f24d7e4cf 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64
+++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64
@@ -77,7 +77,6 @@ ttf-freefont
 unzip
 usplash
 vorbis-tools
-x-ttcidfont-conf
 xdg-user-dirs
 xkb-data
 xorg
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia b/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia
index 9795087f8..7c8954570 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia
+++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia
@@ -75,7 +75,6 @@ ttf-freefont
 unzip
 usplash
 vorbis-tools
-x-ttcidfont-conf
 xdg-user-dirs
 xkb-data
 xorg
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc b/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc
index c33ba4840..1314826f1 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc
+++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc
@@ -75,7 +75,6 @@ ttf-freefont
 unzip
 usplash
 vorbis-tools
-x-ttcidfont-conf
 xdg-user-dirs
 xkb-data
 xorg
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc b/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc
index e28c15bc0..030d93618 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc
+++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc
@@ -73,7 +73,6 @@ ttf-freefont
 unzip
 usplash
 vorbis-tools
-x-ttcidfont-conf
 xdg-user-dirs
 xkb-data
 xorg
diff --git a/ubuntu/precise/tdebindings/debian/libkorundum0-ruby1.8-trinity.install b/ubuntu/precise/tdebindings/debian/libkorundum0-ruby1.8-trinity.install
index c250f2beb..ebec44d37 100644
--- a/ubuntu/precise/tdebindings/debian/libkorundum0-ruby1.8-trinity.install
+++ b/ubuntu/precise/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/ubuntu/precise/tdebindings/debian/libqt0-ruby1.8-trinity.install b/ubuntu/precise/tdebindings/debian/libqt0-ruby1.8-trinity.install
index dc71eead5..2f075b24e 100644
--- a/ubuntu/precise/tdebindings/debian/libqt0-ruby1.8-trinity.install
+++ b/ubuntu/precise/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
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/defaultsettings/redmond-default-settings-ii/debian/control b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/debian/control
index 6cc4c2463..5150015e3 100644
--- a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/debian/control
+++ b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/debian/control
@@ -7,8 +7,8 @@ Standards-Version: 3.8.4
 
 Package: redmond-default-settings-ii-trinity
 Architecture: all
-Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, tqca-tls, readahead, screen, smbclient, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity
-Recommends: firefox, thunderbird, synaptic, tdeio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikamdesktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tde-guidance-powermanager-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic, ttf-kochi-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface
+Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, tqca-tls, readahead, screen, smbclient, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity
+Recommends: firefox, thunderbird, synaptic, tdeio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikamdesktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tde-guidance-powermanager-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic, ttf-kochi-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, gtk3-tqt-engine-trinity
 Suggests: apport-gtk, hplip-gui
 Conflicts: kubuntu-default-settings-trinity, kubuntu-default-settings
 Description: Redmond II default settings and artwork for the Kubuntu Trinity desktop
diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings/debian/control b/ubuntu/raring/defaultsettings/redmond-default-settings/debian/control
index 0cd8ec0f0..16c5c2cb2 100644
--- a/ubuntu/raring/defaultsettings/redmond-default-settings/debian/control
+++ b/ubuntu/raring/defaultsettings/redmond-default-settings/debian/control
@@ -7,8 +7,8 @@ Standards-Version: 3.8.4
 
 Package: redmond-default-settings-trinity
 Architecture: all
-Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, tqca-tls, readahead, screen, smbclient, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity
-Recommends: firefox, thunderbird, synaptic, tdeio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikamdesktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tde-guidance-powermanager-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic, ttf-kochi-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface
+Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, tqca-tls, readahead, screen, smbclient, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity
+Recommends: firefox, thunderbird, synaptic, tdeio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikamdesktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tde-guidance-powermanager-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic, ttf-kochi-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, gtk3-tqt-engine-trinity
 Suggests: apport-gtk, hplip-gui
 Conflicts: kubuntu-default-settings-trinity, kubuntu-default-settings
 Description: Redmond default settings and artwork for the Kubuntu Trinity desktop
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
diff --git a/ubuntu/raring/tdebindings/debian/libkorundum0-ruby1.8-trinity.install b/ubuntu/raring/tdebindings/debian/libkorundum0-ruby1.8-trinity.install
index c250f2beb..ebec44d37 100644
--- a/ubuntu/raring/tdebindings/debian/libkorundum0-ruby1.8-trinity.install
+++ b/ubuntu/raring/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/ubuntu/raring/tdebindings/debian/libqt0-ruby1.8-trinity.install b/ubuntu/raring/tdebindings/debian/libqt0-ruby1.8-trinity.install
index dc71eead5..2f075b24e 100644
--- a/ubuntu/raring/tdebindings/debian/libqt0-ruby1.8-trinity.install
+++ b/ubuntu/raring/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