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

99 files changed, 52 insertions, 52 deletions

diff --git a/debian/lenny/applications/digikam/debian/control b/debian/lenny/applications/digikam/debian/control
index c333d83a3..67ba409c4 100644
--- a/debian/lenny/applications/digikam/debian/control
+++ b/debian/lenny/applications/digikam/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev,
- libtiff-dev, libgphoto2-2-dev, libkipi0-trinity-dev,
+ libtiff-dev, libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev,
  libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
  libjasper-dev, libpng12-dev | libpng-dev, libexiv2-dev,
  libkdcraw3-trinity-dev (>= 0.1.4),
diff --git a/debian/lenny/applications/kvirc/debian/kvirc-trinity.install b/debian/lenny/applications/kvirc/debian/kvirc-trinity.install
index 994dd3e0e..01777294f 100644
--- a/debian/lenny/applications/kvirc/debian/kvirc-trinity.install
+++ b/debian/lenny/applications/kvirc/debian/kvirc-trinity.install
@@ -1,4 +1,4 @@
-debian/overrides/kvirc usr/share/lintian/overrides
+debian/overrides/kvirc-trinity usr/share/lintian/overrides
 debian/tmp/opt/trinity/bin/kvirc
 debian/tmp/opt/trinity/lib/*.so.*
 debian/tmp/opt/trinity/lib/kvirc/*/modules/*.so
diff --git a/debian/lenny/applications/kvirc/debian/overrides/kvirc b/debian/lenny/applications/kvirc/debian/overrides/kvirc
deleted file mode 100644
index dc125fd2e..000000000
--- a/debian/lenny/applications/kvirc/debian/overrides/kvirc
+++ /dev/null
@@ -1,2 +0,0 @@
-kvirc: binary-without-manpage kvirc
-kvirc: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/kvirc.xpm
diff --git a/debian/lenny/applications/kvirc/debian/overrides/kvirc-trinity b/debian/lenny/applications/kvirc/debian/overrides/kvirc-trinity
new file mode 100644
index 000000000..8fc30d2e1
--- /dev/null
+++ b/debian/lenny/applications/kvirc/debian/overrides/kvirc-trinity
@@ -0,0 +1,2 @@
+kvirc-trinity: binary-without-manpage kvirc
+kvirc-trinity: menu-icon-missing /opt/trinity/share/icons/hicolor/32x32/apps/kvirc.xpm
diff --git a/debian/lenny/libraries/kipi-plugins/debian/TODO b/debian/lenny/libraries/kipi-plugins/debian/TODO
index d5025974d..d5025974d 100755..100644
--- a/debian/lenny/libraries/kipi-plugins/debian/TODO
+++ b/debian/lenny/libraries/kipi-plugins/debian/TODO
diff --git a/debian/lenny/libraries/kipi-plugins/debian/changelog b/debian/lenny/libraries/kipi-plugins/debian/changelog
index 0ba259e3b..0ba259e3b 100755..100644
--- a/debian/lenny/libraries/kipi-plugins/debian/changelog
+++ b/debian/lenny/libraries/kipi-plugins/debian/changelog
diff --git a/debian/lenny/libraries/kipi-plugins/debian/compat b/debian/lenny/libraries/kipi-plugins/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/debian/lenny/libraries/kipi-plugins/debian/compat
+++ b/debian/lenny/libraries/kipi-plugins/debian/compat
diff --git a/debian/lenny/libraries/kipi-plugins/debian/control b/debian/lenny/libraries/kipi-plugins/debian/control
index 00381ab9a..035184286 100644
--- a/debian/lenny/libraries/kipi-plugins/debian/control
+++ b/debian/lenny/libraries/kipi-plugins/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-config, tdelibs14-trinity-dev,
- libexiv2-dev, libgphoto2-2-dev, libgpod-nogtk-dev,
+ libexiv2-dev, libgphoto2-6-dev | libgphoto2-2-dev, libgpod-nogtk-dev,
  libkcal2-trinity-dev, libkdcraw3-trinity-dev, libkexiv2-3-trinity-dev,
  libkipi0-trinity-dev, libtiff-dev, libxslt1-dev, tdepim-trinity-dev,
  automake, autoconf, libtool, libltdl-dev
diff --git a/debian/lenny/libraries/kipi-plugins/debian/copyright b/debian/lenny/libraries/kipi-plugins/debian/copyright
index 3df46fc7f..3df46fc7f 100755..100644
--- a/debian/lenny/libraries/kipi-plugins/debian/copyright
+++ b/debian/lenny/libraries/kipi-plugins/debian/copyright
diff --git a/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install b/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
index c7200473e..c7200473e 100755..100644
--- a/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
+++ b/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
diff --git a/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity.install b/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
index b01d3720f..b01d3720f 100755..100644
--- a/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
+++ b/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
diff --git a/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages b/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
index 9d593ba97..9d593ba97 100755..100644
--- a/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
+++ b/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
diff --git a/debian/lenny/libraries/kipi-plugins/debian/patches/series b/debian/lenny/libraries/kipi-plugins/debian/patches/series
index e69de29bb..e69de29bb 100755..100644
--- a/debian/lenny/libraries/kipi-plugins/debian/patches/series
+++ b/debian/lenny/libraries/kipi-plugins/debian/patches/series
diff --git a/debian/lenny/libraries/kipi-plugins/debian/watch b/debian/lenny/libraries/kipi-plugins/debian/watch
index 8e5bdb026..8e5bdb026 100755..100644
--- a/debian/lenny/libraries/kipi-plugins/debian/watch
+++ b/debian/lenny/libraries/kipi-plugins/debian/watch
diff --git a/debian/lenny/tdeedu/debian/control b/debian/lenny/tdeedu/debian/control
index 9b00cc54f..487e5c66d 100644
--- a/debian/lenny/tdeedu/debian/control
+++ b/debian/lenny/tdeedu/debian/control
@@ -220,7 +220,7 @@ Architecture: any
 Section: games
 Replaces: khangman-trinity (<< 4:14.0.0)
 Breaks: khangman-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, ttf-dustin, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, fonts-dustin | ttf-dustin, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: the classical hangman game for Trinity
  KHangMan is a game based on the well known hangman game.  It is aimed
diff --git a/debian/squeeze/applications/digikam/debian/control b/debian/squeeze/applications/digikam/debian/control
index c333d83a3..67ba409c4 100644
--- a/debian/squeeze/applications/digikam/debian/control
+++ b/debian/squeeze/applications/digikam/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev,
- libtiff-dev, libgphoto2-2-dev, libkipi0-trinity-dev,
+ libtiff-dev, libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev,
  libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
  libjasper-dev, libpng12-dev | libpng-dev, libexiv2-dev,
  libkdcraw3-trinity-dev (>= 0.1.4),
diff --git a/debian/squeeze/applications/kvirc/debian/kvirc-trinity.install b/debian/squeeze/applications/kvirc/debian/kvirc-trinity.install
index 994dd3e0e..01777294f 100644
--- a/debian/squeeze/applications/kvirc/debian/kvirc-trinity.install
+++ b/debian/squeeze/applications/kvirc/debian/kvirc-trinity.install
@@ -1,4 +1,4 @@
-debian/overrides/kvirc usr/share/lintian/overrides
+debian/overrides/kvirc-trinity usr/share/lintian/overrides
 debian/tmp/opt/trinity/bin/kvirc
 debian/tmp/opt/trinity/lib/*.so.*
 debian/tmp/opt/trinity/lib/kvirc/*/modules/*.so
diff --git a/debian/squeeze/applications/kvirc/debian/overrides/kvirc b/debian/squeeze/applications/kvirc/debian/overrides/kvirc
deleted file mode 100644
index dc125fd2e..000000000
--- a/debian/squeeze/applications/kvirc/debian/overrides/kvirc
+++ /dev/null
@@ -1,2 +0,0 @@
-kvirc: binary-without-manpage kvirc
-kvirc: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/kvirc.xpm
diff --git a/debian/squeeze/applications/kvirc/debian/overrides/kvirc-trinity b/debian/squeeze/applications/kvirc/debian/overrides/kvirc-trinity
new file mode 100644
index 000000000..8fc30d2e1
--- /dev/null
+++ b/debian/squeeze/applications/kvirc/debian/overrides/kvirc-trinity
@@ -0,0 +1,2 @@
+kvirc-trinity: binary-without-manpage kvirc
+kvirc-trinity: menu-icon-missing /opt/trinity/share/icons/hicolor/32x32/apps/kvirc.xpm
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/TODO b/debian/squeeze/libraries/kipi-plugins/debian/TODO
index d5025974d..d5025974d 100755..100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/TODO
+++ b/debian/squeeze/libraries/kipi-plugins/debian/TODO
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/changelog b/debian/squeeze/libraries/kipi-plugins/debian/changelog
index 0ba259e3b..0ba259e3b 100755..100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/changelog
+++ b/debian/squeeze/libraries/kipi-plugins/debian/changelog
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/compat b/debian/squeeze/libraries/kipi-plugins/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/compat
+++ b/debian/squeeze/libraries/kipi-plugins/debian/compat
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/control b/debian/squeeze/libraries/kipi-plugins/debian/control
index 00381ab9a..035184286 100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/control
+++ b/debian/squeeze/libraries/kipi-plugins/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-config, tdelibs14-trinity-dev,
- libexiv2-dev, libgphoto2-2-dev, libgpod-nogtk-dev,
+ libexiv2-dev, libgphoto2-6-dev | libgphoto2-2-dev, libgpod-nogtk-dev,
  libkcal2-trinity-dev, libkdcraw3-trinity-dev, libkexiv2-3-trinity-dev,
  libkipi0-trinity-dev, libtiff-dev, libxslt1-dev, tdepim-trinity-dev,
  automake, autoconf, libtool, libltdl-dev
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/copyright b/debian/squeeze/libraries/kipi-plugins/debian/copyright
index 3df46fc7f..3df46fc7f 100755..100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/copyright
+++ b/debian/squeeze/libraries/kipi-plugins/debian/copyright
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install b/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
index c7200473e..c7200473e 100755..100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
+++ b/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.install b/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
index b01d3720f..b01d3720f 100755..100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
+++ b/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages b/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
index 9d593ba97..9d593ba97 100755..100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
+++ b/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/patches/series b/debian/squeeze/libraries/kipi-plugins/debian/patches/series
index e69de29bb..e69de29bb 100755..100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/patches/series
+++ b/debian/squeeze/libraries/kipi-plugins/debian/patches/series
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/watch b/debian/squeeze/libraries/kipi-plugins/debian/watch
index 8e5bdb026..8e5bdb026 100755..100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/watch
+++ b/debian/squeeze/libraries/kipi-plugins/debian/watch
diff --git a/debian/squeeze/tdeedu/debian/control b/debian/squeeze/tdeedu/debian/control
index 9b00cc54f..487e5c66d 100644
--- a/debian/squeeze/tdeedu/debian/control
+++ b/debian/squeeze/tdeedu/debian/control
@@ -220,7 +220,7 @@ Architecture: any
 Section: games
 Replaces: khangman-trinity (<< 4:14.0.0)
 Breaks: khangman-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, ttf-dustin, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, fonts-dustin | ttf-dustin, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: the classical hangman game for Trinity
  KHangMan is a game based on the well known hangman game.  It is aimed
diff --git a/debian/wheezy/applications/digikam/debian/control b/debian/wheezy/applications/digikam/debian/control
index c333d83a3..67ba409c4 100644
--- a/debian/wheezy/applications/digikam/debian/control
+++ b/debian/wheezy/applications/digikam/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev,
- libtiff-dev, libgphoto2-2-dev, libkipi0-trinity-dev,
+ libtiff-dev, libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev,
  libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
  libjasper-dev, libpng12-dev | libpng-dev, libexiv2-dev,
  libkdcraw3-trinity-dev (>= 0.1.4),
diff --git a/debian/wheezy/applications/kvirc/debian/kvirc-trinity.install b/debian/wheezy/applications/kvirc/debian/kvirc-trinity.install
index 994dd3e0e..01777294f 100644
--- a/debian/wheezy/applications/kvirc/debian/kvirc-trinity.install
+++ b/debian/wheezy/applications/kvirc/debian/kvirc-trinity.install
@@ -1,4 +1,4 @@
-debian/overrides/kvirc usr/share/lintian/overrides
+debian/overrides/kvirc-trinity usr/share/lintian/overrides
 debian/tmp/opt/trinity/bin/kvirc
 debian/tmp/opt/trinity/lib/*.so.*
 debian/tmp/opt/trinity/lib/kvirc/*/modules/*.so
diff --git a/debian/wheezy/applications/kvirc/debian/overrides/kvirc b/debian/wheezy/applications/kvirc/debian/overrides/kvirc
deleted file mode 100644
index dc125fd2e..000000000
--- a/debian/wheezy/applications/kvirc/debian/overrides/kvirc
+++ /dev/null
@@ -1,2 +0,0 @@
-kvirc: binary-without-manpage kvirc
-kvirc: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/kvirc.xpm
diff --git a/debian/wheezy/applications/kvirc/debian/overrides/kvirc-trinity b/debian/wheezy/applications/kvirc/debian/overrides/kvirc-trinity
new file mode 100644
index 000000000..8fc30d2e1
--- /dev/null
+++ b/debian/wheezy/applications/kvirc/debian/overrides/kvirc-trinity
@@ -0,0 +1,2 @@
+kvirc-trinity: binary-without-manpage kvirc
+kvirc-trinity: menu-icon-missing /opt/trinity/share/icons/hicolor/32x32/apps/kvirc.xpm
diff --git a/debian/wheezy/libraries/kipi-plugins/debian/TODO b/debian/wheezy/libraries/kipi-plugins/debian/TODO
index d5025974d..d5025974d 100755..100644
--- a/debian/wheezy/libraries/kipi-plugins/debian/TODO
+++ b/debian/wheezy/libraries/kipi-plugins/debian/TODO
diff --git a/debian/wheezy/libraries/kipi-plugins/debian/changelog b/debian/wheezy/libraries/kipi-plugins/debian/changelog
index 0ba259e3b..0ba259e3b 100755..100644
--- a/debian/wheezy/libraries/kipi-plugins/debian/changelog
+++ b/debian/wheezy/libraries/kipi-plugins/debian/changelog
diff --git a/debian/wheezy/libraries/kipi-plugins/debian/compat b/debian/wheezy/libraries/kipi-plugins/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/debian/wheezy/libraries/kipi-plugins/debian/compat
+++ b/debian/wheezy/libraries/kipi-plugins/debian/compat
diff --git a/debian/wheezy/libraries/kipi-plugins/debian/control b/debian/wheezy/libraries/kipi-plugins/debian/control
index 00381ab9a..035184286 100644
--- a/debian/wheezy/libraries/kipi-plugins/debian/control
+++ b/debian/wheezy/libraries/kipi-plugins/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-config, tdelibs14-trinity-dev,
- libexiv2-dev, libgphoto2-2-dev, libgpod-nogtk-dev,
+ libexiv2-dev, libgphoto2-6-dev | libgphoto2-2-dev, libgpod-nogtk-dev,
  libkcal2-trinity-dev, libkdcraw3-trinity-dev, libkexiv2-3-trinity-dev,
  libkipi0-trinity-dev, libtiff-dev, libxslt1-dev, tdepim-trinity-dev,
  automake, autoconf, libtool, libltdl-dev
diff --git a/debian/wheezy/libraries/kipi-plugins/debian/copyright b/debian/wheezy/libraries/kipi-plugins/debian/copyright
index 3df46fc7f..3df46fc7f 100755..100644
--- a/debian/wheezy/libraries/kipi-plugins/debian/copyright
+++ b/debian/wheezy/libraries/kipi-plugins/debian/copyright
diff --git a/debian/wheezy/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install b/debian/wheezy/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
index c7200473e..c7200473e 100755..100644
--- a/debian/wheezy/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
+++ b/debian/wheezy/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
diff --git a/debian/wheezy/libraries/kipi-plugins/debian/kipi-plugins-trinity.install b/debian/wheezy/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
index b01d3720f..b01d3720f 100755..100644
--- a/debian/wheezy/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
+++ b/debian/wheezy/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
diff --git a/debian/wheezy/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages b/debian/wheezy/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
index 9d593ba97..9d593ba97 100755..100644
--- a/debian/wheezy/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
+++ b/debian/wheezy/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
diff --git a/debian/wheezy/libraries/kipi-plugins/debian/patches/series b/debian/wheezy/libraries/kipi-plugins/debian/patches/series
index e69de29bb..e69de29bb 100755..100644
--- a/debian/wheezy/libraries/kipi-plugins/debian/patches/series
+++ b/debian/wheezy/libraries/kipi-plugins/debian/patches/series
diff --git a/debian/wheezy/libraries/kipi-plugins/debian/watch b/debian/wheezy/libraries/kipi-plugins/debian/watch
index 8e5bdb026..8e5bdb026 100755..100644
--- a/debian/wheezy/libraries/kipi-plugins/debian/watch
+++ b/debian/wheezy/libraries/kipi-plugins/debian/watch
diff --git a/debian/wheezy/tdeedu/debian/control b/debian/wheezy/tdeedu/debian/control
index 9b00cc54f..487e5c66d 100644
--- a/debian/wheezy/tdeedu/debian/control
+++ b/debian/wheezy/tdeedu/debian/control
@@ -220,7 +220,7 @@ Architecture: any
 Section: games
 Replaces: khangman-trinity (<< 4:14.0.0)
 Breaks: khangman-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, ttf-dustin, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, fonts-dustin | ttf-dustin, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: the classical hangman game for Trinity
  KHangMan is a game based on the well known hangman game.  It is aimed
diff --git a/ubuntu/lucid_automake/kdeedu/debian/control b/ubuntu/lucid_automake/kdeedu/debian/control
index df019170b..52123532b 100644
--- a/ubuntu/lucid_automake/kdeedu/debian/control
+++ b/ubuntu/lucid_automake/kdeedu/debian/control
@@ -194,7 +194,7 @@ Description: data files for KGeography
 Package: khangman-kde3
 Architecture: any
 Section: games
-Depends: ${shlibs:Depends}, ttf-dustin, kdeedu-data-kde3 (>> ${KDE-Version3}), kdeedu-data-kde3 (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, fonts-dustin | ttf-dustin, kdeedu-data-kde3 (>> ${KDE-Version3}), kdeedu-data-kde3 (<< ${KDE-Next-Version3})
 Suggests: khelpcenter-kde3, kdeedu-kde3-doc-html
 Description: the classical hangman game for KDE3
  KHangMan is a game based on the well known hangman game.  It is aimed
diff --git a/ubuntu/maverick/applications/digikam/debian/control b/ubuntu/maverick/applications/digikam/debian/control
index ba871927f..e851cfee2 100644
--- a/ubuntu/maverick/applications/digikam/debian/control
+++ b/ubuntu/maverick/applications/digikam/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev,
- libtiff-dev, libgphoto2-2-dev, libkipi0-trinity-dev,
+ libtiff-dev, libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev,
  libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
  libjasper-dev, libpng12-dev | libpng-dev, libexiv2-dev,
  libkdcraw3-trinity-dev (>= 0.1.4),
diff --git a/ubuntu/maverick/applications/kvirc/debian/kvirc-trinity.install b/ubuntu/maverick/applications/kvirc/debian/kvirc-trinity.install
index 994dd3e0e..01777294f 100644
--- a/ubuntu/maverick/applications/kvirc/debian/kvirc-trinity.install
+++ b/ubuntu/maverick/applications/kvirc/debian/kvirc-trinity.install
@@ -1,4 +1,4 @@
-debian/overrides/kvirc usr/share/lintian/overrides
+debian/overrides/kvirc-trinity usr/share/lintian/overrides
 debian/tmp/opt/trinity/bin/kvirc
 debian/tmp/opt/trinity/lib/*.so.*
 debian/tmp/opt/trinity/lib/kvirc/*/modules/*.so
diff --git a/ubuntu/maverick/applications/kvirc/debian/overrides/kvirc b/ubuntu/maverick/applications/kvirc/debian/overrides/kvirc
deleted file mode 100644
index dc125fd2e..000000000
--- a/ubuntu/maverick/applications/kvirc/debian/overrides/kvirc
+++ /dev/null
@@ -1,2 +0,0 @@
-kvirc: binary-without-manpage kvirc
-kvirc: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/kvirc.xpm
diff --git a/ubuntu/maverick/applications/kvirc/debian/overrides/kvirc-trinity b/ubuntu/maverick/applications/kvirc/debian/overrides/kvirc-trinity
new file mode 100644
index 000000000..8fc30d2e1
--- /dev/null
+++ b/ubuntu/maverick/applications/kvirc/debian/overrides/kvirc-trinity
@@ -0,0 +1,2 @@
+kvirc-trinity: binary-without-manpage kvirc
+kvirc-trinity: menu-icon-missing /opt/trinity/share/icons/hicolor/32x32/apps/kvirc.xpm
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control
index 6df73aeb1..1062710af 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control
+++ b/ubuntu/maverick/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, ttf-bitstream-vera, ttf-dejavu-core, 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, ttf-arabeyes, ttf-arphic-ukai, ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic,ttf-kochi-mincho, ttf-lao, ttf-malayalam-fonts, ttf-thai-tlwg, 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
+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, x-ttcidfont-conf
 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 cd881efa0..6040dbabd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control
+++ b/ubuntu/maverick/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, ttf-bitstream-vera, ttf-dejavu-core, 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, ttf-arabeyes, ttf-arphic-ukai, ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic,ttf-kochi-mincho, ttf-lao, ttf-malayalam-fonts, ttf-thai-tlwg, 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
+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, x-ttcidfont-conf
 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/libraries/kipi-plugins/debian/TODO b/ubuntu/maverick/libraries/kipi-plugins/debian/TODO
index d5025974d..d5025974d 100755..100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/TODO
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/TODO
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/changelog b/ubuntu/maverick/libraries/kipi-plugins/debian/changelog
index 0ba259e3b..0ba259e3b 100755..100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/changelog
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/changelog
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/compat b/ubuntu/maverick/libraries/kipi-plugins/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/compat
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/compat
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/control b/ubuntu/maverick/libraries/kipi-plugins/debian/control
index 6987ef291..9201c9bf6 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/control
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-config, tdelibs14-trinity-dev,
- libexiv2-dev, libgphoto2-2-dev, libgpod-nogtk-dev,
+ libexiv2-dev, libgphoto2-6-dev | libgphoto2-2-dev, libgpod-nogtk-dev,
  libkcal2-trinity-dev, libkdcraw3-trinity-dev, libkexiv2-3-trinity-dev,
  libkipi0-trinity-dev, libtiff-dev, libxslt1-dev, tdepim-trinity-dev,
  automake, autoconf, libtool, libltdl-dev
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/copyright b/ubuntu/maverick/libraries/kipi-plugins/debian/copyright
index 3df46fc7f..3df46fc7f 100755..100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/copyright
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/copyright
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install b/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
index c7200473e..c7200473e 100755..100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.install b/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
index b01d3720f..b01d3720f 100755..100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages b/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
index 9d593ba97..9d593ba97 100755..100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/patches/series b/ubuntu/maverick/libraries/kipi-plugins/debian/patches/series
index e69de29bb..e69de29bb 100755..100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/patches/series
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/patches/series
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/watch b/ubuntu/maverick/libraries/kipi-plugins/debian/watch
index 8e5bdb026..8e5bdb026 100755..100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/watch
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/watch
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/control b/ubuntu/maverick/metapackages/kubuntu-meta/debian/control
index edfa7e104..36eab07c5 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/control
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/control
@@ -7,8 +7,8 @@ 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, ttf-bitstream-vera, ttf-dejavu-core, 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
-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, ttf-arabeyes, ttf-arphic-ukai, ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic,ttf-kochi-mincho, ttf-lao, ttf-malayalam-fonts, ttf-thai-tlwg, ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, smbclient, network-manager-tde-trinity | network-manager-gnome, plymouth-theme-kubuntu-logo-trinity
+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
+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
  This package depends on all of the packages in the Kubuntu TDE desktop system
diff --git a/ubuntu/maverick/tdeedu/debian/control b/ubuntu/maverick/tdeedu/debian/control
index f03b48025..de39b7e8a 100644
--- a/ubuntu/maverick/tdeedu/debian/control
+++ b/ubuntu/maverick/tdeedu/debian/control
@@ -220,7 +220,7 @@ Architecture: any
 Section: games
 Replaces: khangman-kde3 (<< 4:14.0.0), khangman-trinity (<< 4:14.0.0)
 Breaks: khangman-kde3 (<< 4:14.0.0), khangman-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, ttf-dustin, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, fonts-dustin | ttf-dustin, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: the classical hangman game for Trinity
  KHangMan is a game based on the well known hangman game.  It is aimed
diff --git a/ubuntu/maverick_automake/kdeedu/debian/control b/ubuntu/maverick_automake/kdeedu/debian/control
index df019170b..52123532b 100644
--- a/ubuntu/maverick_automake/kdeedu/debian/control
+++ b/ubuntu/maverick_automake/kdeedu/debian/control
@@ -194,7 +194,7 @@ Description: data files for KGeography
 Package: khangman-kde3
 Architecture: any
 Section: games
-Depends: ${shlibs:Depends}, ttf-dustin, kdeedu-data-kde3 (>> ${KDE-Version3}), kdeedu-data-kde3 (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, fonts-dustin | ttf-dustin, kdeedu-data-kde3 (>> ${KDE-Version3}), kdeedu-data-kde3 (<< ${KDE-Next-Version3})
 Suggests: khelpcenter-kde3, kdeedu-kde3-doc-html
 Description: the classical hangman game for KDE3
  KHangMan is a game based on the well known hangman game.  It is aimed
diff --git a/ubuntu/precise/applications/digikam/debian/control b/ubuntu/precise/applications/digikam/debian/control
index ba871927f..e851cfee2 100644
--- a/ubuntu/precise/applications/digikam/debian/control
+++ b/ubuntu/precise/applications/digikam/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev,
- libtiff-dev, libgphoto2-2-dev, libkipi0-trinity-dev,
+ libtiff-dev, libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev,
  libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
  libjasper-dev, libpng12-dev | libpng-dev, libexiv2-dev,
  libkdcraw3-trinity-dev (>= 0.1.4),
diff --git a/ubuntu/precise/applications/kvirc/debian/kvirc-trinity.install b/ubuntu/precise/applications/kvirc/debian/kvirc-trinity.install
index 994dd3e0e..01777294f 100644
--- a/ubuntu/precise/applications/kvirc/debian/kvirc-trinity.install
+++ b/ubuntu/precise/applications/kvirc/debian/kvirc-trinity.install
@@ -1,4 +1,4 @@
-debian/overrides/kvirc usr/share/lintian/overrides
+debian/overrides/kvirc-trinity usr/share/lintian/overrides
 debian/tmp/opt/trinity/bin/kvirc
 debian/tmp/opt/trinity/lib/*.so.*
 debian/tmp/opt/trinity/lib/kvirc/*/modules/*.so
diff --git a/ubuntu/precise/applications/kvirc/debian/overrides/kvirc b/ubuntu/precise/applications/kvirc/debian/overrides/kvirc
deleted file mode 100644
index dc125fd2e..000000000
--- a/ubuntu/precise/applications/kvirc/debian/overrides/kvirc
+++ /dev/null
@@ -1,2 +0,0 @@
-kvirc: binary-without-manpage kvirc
-kvirc: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/kvirc.xpm
diff --git a/ubuntu/precise/applications/kvirc/debian/overrides/kvirc-trinity b/ubuntu/precise/applications/kvirc/debian/overrides/kvirc-trinity
new file mode 100644
index 000000000..8fc30d2e1
--- /dev/null
+++ b/ubuntu/precise/applications/kvirc/debian/overrides/kvirc-trinity
@@ -0,0 +1,2 @@
+kvirc-trinity: binary-without-manpage kvirc
+kvirc-trinity: menu-icon-missing /opt/trinity/share/icons/hicolor/32x32/apps/kvirc.xpm
diff --git a/ubuntu/precise/libraries/kipi-plugins/debian/TODO b/ubuntu/precise/libraries/kipi-plugins/debian/TODO
index d5025974d..d5025974d 100755..100644
--- a/ubuntu/precise/libraries/kipi-plugins/debian/TODO
+++ b/ubuntu/precise/libraries/kipi-plugins/debian/TODO
diff --git a/ubuntu/precise/libraries/kipi-plugins/debian/changelog b/ubuntu/precise/libraries/kipi-plugins/debian/changelog
index 0ba259e3b..0ba259e3b 100755..100644
--- a/ubuntu/precise/libraries/kipi-plugins/debian/changelog
+++ b/ubuntu/precise/libraries/kipi-plugins/debian/changelog
diff --git a/ubuntu/precise/libraries/kipi-plugins/debian/compat b/ubuntu/precise/libraries/kipi-plugins/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/ubuntu/precise/libraries/kipi-plugins/debian/compat
+++ b/ubuntu/precise/libraries/kipi-plugins/debian/compat
diff --git a/ubuntu/precise/libraries/kipi-plugins/debian/control b/ubuntu/precise/libraries/kipi-plugins/debian/control
index 6987ef291..9201c9bf6 100644
--- a/ubuntu/precise/libraries/kipi-plugins/debian/control
+++ b/ubuntu/precise/libraries/kipi-plugins/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-config, tdelibs14-trinity-dev,
- libexiv2-dev, libgphoto2-2-dev, libgpod-nogtk-dev,
+ libexiv2-dev, libgphoto2-6-dev | libgphoto2-2-dev, libgpod-nogtk-dev,
  libkcal2-trinity-dev, libkdcraw3-trinity-dev, libkexiv2-3-trinity-dev,
  libkipi0-trinity-dev, libtiff-dev, libxslt1-dev, tdepim-trinity-dev,
  automake, autoconf, libtool, libltdl-dev
diff --git a/ubuntu/precise/libraries/kipi-plugins/debian/copyright b/ubuntu/precise/libraries/kipi-plugins/debian/copyright
index 3df46fc7f..3df46fc7f 100755..100644
--- a/ubuntu/precise/libraries/kipi-plugins/debian/copyright
+++ b/ubuntu/precise/libraries/kipi-plugins/debian/copyright
diff --git a/ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install b/ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
index c7200473e..c7200473e 100755..100644
--- a/ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
+++ b/ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
diff --git a/ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity.install b/ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
index b01d3720f..b01d3720f 100755..100644
--- a/ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
+++ b/ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
diff --git a/ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages b/ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
index 9d593ba97..9d593ba97 100755..100644
--- a/ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
+++ b/ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
diff --git a/ubuntu/precise/libraries/kipi-plugins/debian/patches/series b/ubuntu/precise/libraries/kipi-plugins/debian/patches/series
index e69de29bb..e69de29bb 100755..100644
--- a/ubuntu/precise/libraries/kipi-plugins/debian/patches/series
+++ b/ubuntu/precise/libraries/kipi-plugins/debian/patches/series
diff --git a/ubuntu/precise/libraries/kipi-plugins/debian/watch b/ubuntu/precise/libraries/kipi-plugins/debian/watch
index 8e5bdb026..8e5bdb026 100755..100644
--- a/ubuntu/precise/libraries/kipi-plugins/debian/watch
+++ b/ubuntu/precise/libraries/kipi-plugins/debian/watch
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/debian/control b/ubuntu/precise/metapackages/kubuntu-meta/debian/control
index edfa7e104..36eab07c5 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/control
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/control
@@ -7,8 +7,8 @@ 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, ttf-bitstream-vera, ttf-dejavu-core, 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
-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, ttf-arabeyes, ttf-arphic-ukai, ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic,ttf-kochi-mincho, ttf-lao, ttf-malayalam-fonts, ttf-thai-tlwg, ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, smbclient, network-manager-tde-trinity | network-manager-gnome, plymouth-theme-kubuntu-logo-trinity
+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
+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
  This package depends on all of the packages in the Kubuntu TDE desktop system
diff --git a/ubuntu/precise/tdeedu/debian/control b/ubuntu/precise/tdeedu/debian/control
index f03b48025..de39b7e8a 100644
--- a/ubuntu/precise/tdeedu/debian/control
+++ b/ubuntu/precise/tdeedu/debian/control
@@ -220,7 +220,7 @@ Architecture: any
 Section: games
 Replaces: khangman-kde3 (<< 4:14.0.0), khangman-trinity (<< 4:14.0.0)
 Breaks: khangman-kde3 (<< 4:14.0.0), khangman-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, ttf-dustin, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, fonts-dustin | ttf-dustin, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: the classical hangman game for Trinity
  KHangMan is a game based on the well known hangman game.  It is aimed
diff --git a/ubuntu/raring/applications/digikam/debian/control b/ubuntu/raring/applications/digikam/debian/control
index ba871927f..e851cfee2 100644
--- a/ubuntu/raring/applications/digikam/debian/control
+++ b/ubuntu/raring/applications/digikam/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev,
- libtiff-dev, libgphoto2-2-dev, libkipi0-trinity-dev,
+ libtiff-dev, libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev,
  libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
  libjasper-dev, libpng12-dev | libpng-dev, libexiv2-dev,
  libkdcraw3-trinity-dev (>= 0.1.4),
diff --git a/ubuntu/raring/applications/kvirc/debian/kvirc-trinity.install b/ubuntu/raring/applications/kvirc/debian/kvirc-trinity.install
index 994dd3e0e..01777294f 100644
--- a/ubuntu/raring/applications/kvirc/debian/kvirc-trinity.install
+++ b/ubuntu/raring/applications/kvirc/debian/kvirc-trinity.install
@@ -1,4 +1,4 @@
-debian/overrides/kvirc usr/share/lintian/overrides
+debian/overrides/kvirc-trinity usr/share/lintian/overrides
 debian/tmp/opt/trinity/bin/kvirc
 debian/tmp/opt/trinity/lib/*.so.*
 debian/tmp/opt/trinity/lib/kvirc/*/modules/*.so
diff --git a/ubuntu/raring/applications/kvirc/debian/overrides/kvirc b/ubuntu/raring/applications/kvirc/debian/overrides/kvirc
deleted file mode 100644
index dc125fd2e..000000000
--- a/ubuntu/raring/applications/kvirc/debian/overrides/kvirc
+++ /dev/null
@@ -1,2 +0,0 @@
-kvirc: binary-without-manpage kvirc
-kvirc: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/kvirc.xpm
diff --git a/ubuntu/raring/applications/kvirc/debian/overrides/kvirc-trinity b/ubuntu/raring/applications/kvirc/debian/overrides/kvirc-trinity
new file mode 100644
index 000000000..8fc30d2e1
--- /dev/null
+++ b/ubuntu/raring/applications/kvirc/debian/overrides/kvirc-trinity
@@ -0,0 +1,2 @@
+kvirc-trinity: binary-without-manpage kvirc
+kvirc-trinity: menu-icon-missing /opt/trinity/share/icons/hicolor/32x32/apps/kvirc.xpm
diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/debian/control b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/debian/control
index c629ee4ea..6cc4c2463 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, ttf-bitstream-vera, ttf-dejavu-core, 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, ttf-arabeyes, ttf-arphic-ukai, ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic,ttf-kochi-mincho, ttf-lao, ttf-malayalam-fonts, ttf-thai-tlwg, 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, 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
 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 9aa95fcd4..0cd8ec0f0 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, ttf-bitstream-vera, ttf-dejavu-core, 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, ttf-arabeyes, ttf-arphic-ukai, ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic,ttf-kochi-mincho, ttf-lao, ttf-malayalam-fonts, ttf-thai-tlwg, 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, 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
 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/kipi-plugins/debian/TODO b/ubuntu/raring/libraries/kipi-plugins/debian/TODO
index d5025974d..d5025974d 100755..100644
--- a/ubuntu/raring/libraries/kipi-plugins/debian/TODO
+++ b/ubuntu/raring/libraries/kipi-plugins/debian/TODO
diff --git a/ubuntu/raring/libraries/kipi-plugins/debian/changelog b/ubuntu/raring/libraries/kipi-plugins/debian/changelog
index 0ba259e3b..0ba259e3b 100755..100644
--- a/ubuntu/raring/libraries/kipi-plugins/debian/changelog
+++ b/ubuntu/raring/libraries/kipi-plugins/debian/changelog
diff --git a/ubuntu/raring/libraries/kipi-plugins/debian/compat b/ubuntu/raring/libraries/kipi-plugins/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/ubuntu/raring/libraries/kipi-plugins/debian/compat
+++ b/ubuntu/raring/libraries/kipi-plugins/debian/compat
diff --git a/ubuntu/raring/libraries/kipi-plugins/debian/control b/ubuntu/raring/libraries/kipi-plugins/debian/control
index 6987ef291..9201c9bf6 100644
--- a/ubuntu/raring/libraries/kipi-plugins/debian/control
+++ b/ubuntu/raring/libraries/kipi-plugins/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-config, tdelibs14-trinity-dev,
- libexiv2-dev, libgphoto2-2-dev, libgpod-nogtk-dev,
+ libexiv2-dev, libgphoto2-6-dev | libgphoto2-2-dev, libgpod-nogtk-dev,
  libkcal2-trinity-dev, libkdcraw3-trinity-dev, libkexiv2-3-trinity-dev,
  libkipi0-trinity-dev, libtiff-dev, libxslt1-dev, tdepim-trinity-dev,
  automake, autoconf, libtool, libltdl-dev
diff --git a/ubuntu/raring/libraries/kipi-plugins/debian/copyright b/ubuntu/raring/libraries/kipi-plugins/debian/copyright
index 3df46fc7f..3df46fc7f 100755..100644
--- a/ubuntu/raring/libraries/kipi-plugins/debian/copyright
+++ b/ubuntu/raring/libraries/kipi-plugins/debian/copyright
diff --git a/ubuntu/raring/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install b/ubuntu/raring/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
index c7200473e..c7200473e 100755..100644
--- a/ubuntu/raring/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
+++ b/ubuntu/raring/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
diff --git a/ubuntu/raring/libraries/kipi-plugins/debian/kipi-plugins-trinity.install b/ubuntu/raring/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
index b01d3720f..b01d3720f 100755..100644
--- a/ubuntu/raring/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
+++ b/ubuntu/raring/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
diff --git a/ubuntu/raring/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages b/ubuntu/raring/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
index 9d593ba97..9d593ba97 100755..100644
--- a/ubuntu/raring/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
+++ b/ubuntu/raring/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
diff --git a/ubuntu/raring/libraries/kipi-plugins/debian/patches/series b/ubuntu/raring/libraries/kipi-plugins/debian/patches/series
index e69de29bb..e69de29bb 100755..100644
--- a/ubuntu/raring/libraries/kipi-plugins/debian/patches/series
+++ b/ubuntu/raring/libraries/kipi-plugins/debian/patches/series
diff --git a/ubuntu/raring/libraries/kipi-plugins/debian/watch b/ubuntu/raring/libraries/kipi-plugins/debian/watch
index 8e5bdb026..8e5bdb026 100755..100644
--- a/ubuntu/raring/libraries/kipi-plugins/debian/watch
+++ b/ubuntu/raring/libraries/kipi-plugins/debian/watch
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/debian/control b/ubuntu/raring/metapackages/kubuntu-meta/debian/control
index bebeeffa6..add6683b2 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/control
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/control
@@ -7,8 +7,8 @@ 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, ttf-bitstream-vera, ttf-dejavu-core, 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, ttf-arabeyes, ttf-arphic-ukai, ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic,ttf-kochi-mincho, ttf-lao, ttf-malayalam-fonts, ttf-thai-tlwg, ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, smbclient, network-manager-tde-trinity | network-manager-gnome, plymouth-theme-kubuntu-logo-trinity
+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
  This package depends on all of the packages in the Kubuntu TDE desktop system
diff --git a/ubuntu/raring/tdeedu/debian/control b/ubuntu/raring/tdeedu/debian/control
index f03b48025..de39b7e8a 100644
--- a/ubuntu/raring/tdeedu/debian/control
+++ b/ubuntu/raring/tdeedu/debian/control
@@ -220,7 +220,7 @@ Architecture: any
 Section: games
 Replaces: khangman-kde3 (<< 4:14.0.0), khangman-trinity (<< 4:14.0.0)
 Breaks: khangman-kde3 (<< 4:14.0.0), khangman-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, ttf-dustin, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, fonts-dustin | ttf-dustin, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: the classical hangman game for Trinity
  KHangMan is a game based on the well known hangman game.  It is aimed