9 files changed, 12 insertions, 12 deletions
diff --git a/debian/squeeze/tdeaccessibility/debian/control b/debian/squeeze/tdeaccessibility/debian/control
index bc2ab50d2..fef62b6bc 100644
--- a/debian/squeeze/tdeaccessibility/debian/control
+++ b/debian/squeeze/tdeaccessibility/debian/control
@@ -13,7 +13,7 @@ Architecture: all
 Replaces: kdeaccessibility-trinity (<< 4:14.0.0)
 Breaks: kdeaccessibility-trinity (<< 4:14.0.0)
 Depends: kmag-trinity (>= ${Source-Version}), kmousetool-trinity (>= ${Source-Version}), kmouth-trinity (>= ${Source-Version}), kbstate-trinity (>= ${Source-Version}), ksayit-trinity (>= ${Source-Version}), kttsd-trinity (>= ${Source-Version})
-Recommends: kde-icons-mono-trinity (>= ${Source-Version})
+Recommends: tde-icons-mono-trinity (>= ${Source-Version})
 Suggests: kttsd-contrib-plugins-trinity (>= ${Source-Version}), tdeaccessibility-trinity-doc-html (>= ${Source-Version})
 Description: accessibility packages from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -46,7 +46,7 @@ Description: KDE accessibility documentation in HTML format
  This package is part of Trinity, and a component of the KDE accessibility
  module. See the 'kde-trinity' and 'tdeaccessibility-trinity' packages for more information.
 
-Package: kde-icons-mono-trinity
+Package: tde-icons-mono-trinity
 Section: tde
 Architecture: all
 Replaces: kde-icons-mono-trinity (<< 4:14.0.0)
diff --git a/debian/squeeze/tdeaccessibility/debian/kde-icons-mono-trinity.install b/debian/squeeze/tdeaccessibility/debian/tde-icons-mono-trinity.install
index 8c4265ceb..8c4265ceb 100644
--- a/debian/squeeze/tdeaccessibility/debian/kde-icons-mono-trinity.install
+++ b/debian/squeeze/tdeaccessibility/debian/tde-icons-mono-trinity.install
diff --git a/debian/squeeze/tdeartwork/debian/control b/debian/squeeze/tdeartwork/debian/control
index 56a6ec0d3..7ac1920c6 100644
--- a/debian/squeeze/tdeartwork/debian/control
+++ b/debian/squeeze/tdeartwork/debian/control
@@ -13,7 +13,7 @@ Architecture: all
 Section: tde
 Replaces: kdeartwork-trinity (<< 4:14.0.0)
 Breaks: kdeartwork-trinity (<< 4:14.0.0)
-Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version})
+Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), tdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version})
 Recommends: tdescreensaver-xsavers-trinity
 Description: themes, styles and more from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -98,7 +98,7 @@ Description: window decoration themes released with Trinity
  This package is part of Trinity, and a component of the KDE artwork module.
  See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
-Package: kdewallpapers-trinity
+Package: tdewallpapers-trinity
 Architecture: all
 Section: tde
 Replaces: kdewallpapers-trinity (<< 4:14.0.0)
diff --git a/debian/squeeze/tdeartwork/debian/kdewallpapers-trinity.install b/debian/squeeze/tdeartwork/debian/tdewallpapers-trinity.install
index 681454953..681454953 100644
--- a/debian/squeeze/tdeartwork/debian/kdewallpapers-trinity.install
+++ b/debian/squeeze/tdeartwork/debian/tdewallpapers-trinity.install
diff --git a/debian/squeeze/tdeutils/debian/control b/debian/squeeze/tdeutils/debian/control
index 56d984a2a..43aff85f0 100644
--- a/debian/squeeze/tdeutils/debian/control
+++ b/debian/squeeze/tdeutils/debian/control
@@ -13,7 +13,7 @@ Section: tde
 Architecture: all
 Replaces: kdeutils-trinity (<< 4:14.0.0)
 Breaks: kdeutils-trinity (<< 4:14.0.0)
-Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
+Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), tdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
 Suggests: tdeutils-trinity-doc-html (>= ${Source-Version})
 Description: general purpose utilities from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -61,7 +61,7 @@ Section: utils
 Architecture: any
 Replaces: kdeutils-trinity-dev (<< 4:14.0.0)
 Breaks: kdeutils-trinity-dev (<< 4:14.0.0)
-Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev
+Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), tdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Description: development files for the Trinity utilities module
  This package contains development files needed to compile tdeutils
  applications.
@@ -124,7 +124,7 @@ Description: character selector for Trinity
  This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
-Package: kdelirc-trinity
+Package: tdelirc-trinity
 Section: utils
 Architecture: any
 Replaces: kdelirc-trinity (<< 4:14.0.0)
@@ -140,8 +140,8 @@ Description: infrared control for Trinity
 Package: tdessh-trinity
 Section: tde
 Architecture: any
-Replaces: tdessh-trinity (<< 4:14.0.0)
-Breaks: tdessh-trinity (<< 4:14.0.0)
+Replaces: kdessh-trinity (<< 4:14.0.0)
+Breaks: kdessh-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, openssh-client | ssh-client
 Description: ssh frontend for Trinity
  This package contains KDE's frontend for ssh.
diff --git a/debian/squeeze/tdeutils/debian/kdelirc-trinity.lintian b/debian/squeeze/tdeutils/debian/kdelirc-trinity.lintian
deleted file mode 100644
index 986b7f7d4..000000000
--- a/debian/squeeze/tdeutils/debian/kdelirc-trinity.lintian
+++ /dev/null
@@ -1,3 +0,0 @@
-kdelirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so
-kdelirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
-kdelirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
diff --git a/debian/squeeze/tdeutils/debian/kdelirc-trinity.install b/debian/squeeze/tdeutils/debian/tdelirc-trinity.install
index 8570e2ffa..8570e2ffa 100644
--- a/debian/squeeze/tdeutils/debian/kdelirc-trinity.install
+++ b/debian/squeeze/tdeutils/debian/tdelirc-trinity.install
diff --git a/debian/squeeze/tdeutils/debian/tdelirc-trinity.lintian b/debian/squeeze/tdeutils/debian/tdelirc-trinity.lintian
new file mode 100644
index 000000000..0c89583f3
--- /dev/null
+++ b/debian/squeeze/tdeutils/debian/tdelirc-trinity.lintian
@@ -0,0 +1,3 @@
+tdelirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so
+tdelirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
+tdelirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
diff --git a/debian/squeeze/tdeutils/debian/kdessh-trinity.install b/debian/squeeze/tdeutils/debian/tdessh-trinity.install
index cf26ccd1d..cf26ccd1d 100644
--- a/debian/squeeze/tdeutils/debian/kdessh-trinity.install
+++ b/debian/squeeze/tdeutils/debian/tdessh-trinity.install