4 files changed, 4 insertions, 4 deletions
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