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

45 files changed, 18 insertions, 18 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