Finish renaming kiconedit->tdeiconedit on Debian and Ubuntu

123 files changed, 402 insertions, 444 deletions

diff --git a/debian/lenny/metapackages/rename-meta/debian/control b/debian/lenny/metapackages/rename-meta/debian/control
index 2f739f1cc..cbb957038 100644
--- a/debian/lenny/metapackages/rename-meta/debian/control
+++ b/debian/lenny/metapackages/rename-meta/debian/control
@@ -264,6 +264,12 @@ Depends: tdegraphics-trinity-dbg
 Conflicts: kdegraphics-trinity-dbg (<< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
+Package: kiconedit-trinity
+Architecture: all
+Depends: tdeiconedit-trinity
+Conflicts: kiconedit-trinity (<< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
 Package: kdesvn-trinity
 Architecture: all
 Depends: tdesvn-trinity
diff --git a/debian/lenny/tdegraphics/debian/control b/debian/lenny/tdegraphics/debian/control
index c1216156b..98da85a33 100644
--- a/debian/lenny/tdegraphics/debian/control
+++ b/debian/lenny/tdegraphics/debian/control
@@ -12,7 +12,7 @@ Section: tde
 Architecture: all
 Replaces: kdegraphics-trinity (<< 4:14.0.0~)
 Breaks: kdegraphics-trinity (<< 4:14.0.0~)
-Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-tdefile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), kiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
+Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-tdefile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), tdeiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
 Suggests: tdegraphics-trinity-doc-html (>= ${source:Version})
 Description: graphics apps from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -176,7 +176,7 @@ Description: PostScript viewer for Trinity
  This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
-Package: kiconedit-trinity
+Package: tdeiconedit-trinity
 Section: graphics
 Architecture: any
 Replaces: kiconedit-trinity (<< 4:14.0.0~)
diff --git a/debian/lenny/tdegraphics/debian/control.in b/debian/lenny/tdegraphics/debian/control.in
index 88b71b09b..3dd5c6cbe 100644
--- a/debian/lenny/tdegraphics/debian/control.in
+++ b/debian/lenny/tdegraphics/debian/control.in
@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: tdegraphics
 Section: tde
 Architecture: all
-Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), tdegraphics-tdefile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), kiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
+Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), tdegraphics-tdefile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), tdeiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
 Suggests: tdegraphics-doc-html (>= ${source:Version})
 Description: graphics apps from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -154,7 +154,7 @@ Description: PostScript viewer for KDE
  This package is part of KDE, as a component of the KDE graphics module.
  See the 'kde' and 'tdegraphics' packages for more information.
 
-Package: kiconedit
+Package: tdeiconedit
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
diff --git a/debian/lenny/tdegraphics/debian/icons/kiconedit-16.xpm b/debian/lenny/tdegraphics/debian/icons/tdeiconedit-16.xpm
index 857f5fe1c..1eff4882e 100644
--- a/debian/lenny/tdegraphics/debian/icons/kiconedit-16.xpm
+++ b/debian/lenny/tdegraphics/debian/icons/tdeiconedit-16.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *kiconedit-16[] = {
+static char *tdeiconedit-16[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 20 1",
 "  c black",
diff --git a/debian/squeeze/tdegraphics/debian/icons/kiconedit.xpm b/debian/lenny/tdegraphics/debian/icons/tdeiconedit.xpm
index 412544858..7bc8278e4 100644
--- a/debian/squeeze/tdegraphics/debian/icons/kiconedit.xpm
+++ b/debian/lenny/tdegraphics/debian/icons/tdeiconedit.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *kiconedit[] = {
+static char *tdeiconedit[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 242 2",
 "   c #000000",
diff --git a/debian/lenny/tdegraphics/debian/kcoloredit-trinity.menu b/debian/lenny/tdegraphics/debian/kcoloredit-trinity.menu
index 24dc70519..0ac64569b 100644
--- a/debian/lenny/tdegraphics/debian/kcoloredit-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kcoloredit-trinity.menu
@@ -1,4 +1,4 @@
-?package(kcoloredit):\
+?package(kcoloredit-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\
@@ -7,7 +7,7 @@
 	icon16x16="/opt/trinity/share/pixmaps/kcolorchooser-16.xpm"\
 	command="/opt/trinity/bin/kcolorchooser"
 
-?package(kcoloredit):\
+?package(kcoloredit-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\
diff --git a/debian/lenny/tdegraphics/debian/kdvi-trinity.menu b/debian/lenny/tdegraphics/debian/kdvi-trinity.menu
index f1bfa96a5..0e6e44390 100644
--- a/debian/lenny/tdegraphics/debian/kdvi-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kdvi-trinity.menu
@@ -1,4 +1,4 @@
-?package(kdvi):\
+?package(kdvi-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,DVI,Documents"\
diff --git a/debian/lenny/tdegraphics/debian/kfax-trinity.menu b/debian/lenny/tdegraphics/debian/kfax-trinity.menu
index 810a67ff6..f9a2df65c 100644
--- a/debian/lenny/tdegraphics/debian/kfax-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kfax-trinity.menu
@@ -1,4 +1,4 @@
-?package(kfax):\
+?package(kfax-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\
diff --git a/debian/lenny/tdegraphics/debian/kfaxview-trinity.menu b/debian/lenny/tdegraphics/debian/kfaxview-trinity.menu
index a44fcd5a1..578a03eb0 100644
--- a/debian/lenny/tdegraphics/debian/kfaxview-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kfaxview-trinity.menu
@@ -1,4 +1,4 @@
-?package(kfaxview):\
+?package(kfaxview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\
diff --git a/debian/lenny/tdegraphics/debian/kghostview-trinity.menu b/debian/lenny/tdegraphics/debian/kghostview-trinity.menu
index cd27c5660..c736aadeb 100644
--- a/debian/lenny/tdegraphics/debian/kghostview-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kghostview-trinity.menu
@@ -1,4 +1,4 @@
-?package(kghostview):\
+?package(kghostview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,Documents"\
diff --git a/debian/lenny/tdegraphics/debian/kiconedit-trinity.install b/debian/lenny/tdegraphics/debian/kiconedit-trinity.install
deleted file mode 100644
index eebb5b877..000000000
--- a/debian/lenny/tdegraphics/debian/kiconedit-trinity.install
+++ /dev/null
@@ -1,41 +0,0 @@
-debian/tmp/opt/trinity/bin/kiconedit
-debian/tmp/opt/trinity/share/applications/tde/kiconedit.desktop
-debian/tmp/opt/trinity/share/apps/kiconedit/kiconeditui.rc
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/aim-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/aim.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/airbrush-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/areaselect.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/circle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/colorpicker-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/compressed.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/ellipse.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/eraser-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/fileclose.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/fill-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledcircle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledellipse.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledrectangle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/grayscale.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/grid.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/kdepalette.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/line.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/paintbrush-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/pointer.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/rectangle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/selectcircle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/selectrect.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/source.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/standard.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/transform.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/window_new.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/kiconedit-configuration.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kiconedit.png
-
-debian/icons/kiconedit.xpm		/opt/trinity/share/pixmaps
-debian/icons/kiconedit-16.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/lenny/tdegraphics/debian/kiconedit-trinity.manpages b/debian/lenny/tdegraphics/debian/kiconedit-trinity.manpages
deleted file mode 100644
index 2f136ed6c..000000000
--- a/debian/lenny/tdegraphics/debian/kiconedit-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kiconedit.1
diff --git a/debian/lenny/tdegraphics/debian/kiconedit-trinity.menu b/debian/lenny/tdegraphics/debian/kiconedit-trinity.menu
deleted file mode 100644
index 7fb1d2a3b..000000000
--- a/debian/lenny/tdegraphics/debian/kiconedit-trinity.menu
+++ /dev/null
@@ -1,11 +0,0 @@
-?package(kiconedit):\
-	needs="X11"\
-	section="Applications/Graphics"\
-	hints="TDE"\
-	title="TDEIconEdit"\
-	icon32x32="/opt/trinity/share/pixmaps/kiconedit.xpm"\
-	icon16x16="/opt/trinity/share/pixmaps/kiconedit-16.xpm"\
-	command="/opt/trinity/bin/kiconedit"
-
-# Icon 32x32 kiconedit/pics/cr32-app-kiconedit.png kiconedit.xpm
-# Icon 16x16 kiconedit/pics/cr16-app-kiconedit.png kiconedit-16.xpm
diff --git a/debian/lenny/tdegraphics/debian/kolourpaint-trinity.menu b/debian/lenny/tdegraphics/debian/kolourpaint-trinity.menu
index 9372e79f3..e975fb924 100644
--- a/debian/lenny/tdegraphics/debian/kolourpaint-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kolourpaint-trinity.menu
@@ -1,4 +1,4 @@
-?package(kolourpaint):\
+?package(kolourpaint-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\
diff --git a/debian/lenny/tdegraphics/debian/kooka-trinity.menu b/debian/lenny/tdegraphics/debian/kooka-trinity.menu
index e922d7a70..7160864c7 100644
--- a/debian/lenny/tdegraphics/debian/kooka-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kooka-trinity.menu
@@ -1,4 +1,4 @@
-?package(kooka):\
+?package(kooka-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\
diff --git a/debian/lenny/tdegraphics/debian/kpdf-trinity.menu b/debian/lenny/tdegraphics/debian/kpdf-trinity.menu
index da324176a..2c47592cb 100644
--- a/debian/lenny/tdegraphics/debian/kpdf-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kpdf-trinity.menu
@@ -1,4 +1,4 @@
-?package(kpdf):\
+?package(kpdf-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\
diff --git a/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.menu b/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.menu
index 3287726f7..dfbeb0de3 100644
--- a/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.menu
@@ -1,4 +1,4 @@
-?package(kpovmodeler):\
+?package(kpovmodeler-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE,Modeler"\
diff --git a/debian/lenny/tdegraphics/debian/kruler-trinity.menu b/debian/lenny/tdegraphics/debian/kruler-trinity.menu
index 906bcae11..3a16985a9 100644
--- a/debian/lenny/tdegraphics/debian/kruler-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kruler-trinity.menu
@@ -1,4 +1,4 @@
-?package(kruler):\
+?package(kruler-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\
diff --git a/debian/lenny/tdegraphics/debian/ksnapshot-trinity.menu b/debian/lenny/tdegraphics/debian/ksnapshot-trinity.menu
index b82c77733..b26ad0ebb 100644
--- a/debian/lenny/tdegraphics/debian/ksnapshot-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/ksnapshot-trinity.menu
@@ -1,4 +1,4 @@
-?package(ksnapshot):\
+?package(ksnapshot-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\
diff --git a/debian/lenny/tdegraphics/debian/kuickshow-trinity.menu b/debian/lenny/tdegraphics/debian/kuickshow-trinity.menu
index ed69377fb..9c1e89437 100644
--- a/debian/lenny/tdegraphics/debian/kuickshow-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kuickshow-trinity.menu
@@ -1,4 +1,4 @@
-?package(kuickshow):\
+?package(kuickshow-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\
diff --git a/debian/lenny/tdegraphics/debian/kview-trinity.menu b/debian/lenny/tdegraphics/debian/kview-trinity.menu
index e40a31e43..f4bad022f 100644
--- a/debian/lenny/tdegraphics/debian/kview-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kview-trinity.menu
@@ -1,4 +1,4 @@
-?package(kview):\
+?package(kview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,Images"\
diff --git a/debian/lenny/tdegraphics/debian/man/kiconedit.1 b/debian/lenny/tdegraphics/debian/man/tdeiconedit.1
index fd99e9acf..335c1fa0d 100644
--- a/debian/lenny/tdegraphics/debian/man/kiconedit.1
+++ b/debian/lenny/tdegraphics/debian/man/tdeiconedit.1
@@ -1,21 +1,21 @@
-.TH KICONEDIT "1" "September 2002" KDE "KDE Application"
+.TH TDEICONEDIT "1" "September 2002" TDE "TDE Application"
 .SH NAME
-kiconedit \- KDE Icon Editor
+tdeiconedit \- TDE Icon Editor
 .SH SYNOPSIS
-.B kiconedit
+.B tdeiconedit
 [\fIQt-options\fR] [\fIKDE-options\fR] [\fIfile(s)\fR]
 .SH DESCRIPTION
 This manual page documents briefly the
 .B TDEIconEdit
-KDE Application.
+TDE Application.
 This manual page was written for the Debian GNU/Linux distribution
 because the original program does not have a manual page.
 .P
 .B TDEIconEdit
-is designed to help create icons for KDE using the standard
+is designed to help create icons for TDE using the standard
 icon palette.  
 .PP
-KDE Icon Editor
+TDE Icon Editor
 .SH AUTHOR
 TDEIconEdit was written by
 .nh
@@ -40,7 +40,7 @@ Show help about options
 \fB\-\-help\-qt\fR
 Show Qt specific options
 .TP
-\fB\-\-help\-kde\fR
+\fB\-\-help\-tde\fR
 Show KDE specific options
 .TP
 \fB\-\-help\-all\fR
@@ -68,7 +68,7 @@ is maintained as a docbook manual.  If the
 .B khelpcenter
 program is properly installed at your site, the command
 .IP
-.B khelpcenter help:/kiconedit
+.B khelpcenter help:/tdeiconedit
 .PP
 should give you access to the complete manual.
 .SH AUTHOR
diff --git a/debian/lenny/tdegraphics/debian/rules b/debian/lenny/tdegraphics/debian/rules
index 87727752f..53d2aa297 100755
--- a/debian/lenny/tdegraphics/debian/rules
+++ b/debian/lenny/tdegraphics/debian/rules
@@ -14,9 +14,21 @@ include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
--DWITH_TIFF="ON" -DWITH_OPENEXR="ON" -DWITH_PDF="ON" \
--DCMAKE_BUILD_TYPE=RelWithDebInfo
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DLIB_SUFFIX="" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \
+ -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DBUILD_ALL="ON" \
+ -DWITH_TIFF="ON" \
+ -DWITH_OPENEXR="ON" \
+ -DWITH_PDF="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.
@@ -57,81 +69,49 @@ kuickshow-trinity-tar:
 	cd ..; tar zcf kuickshow-trinity_3.5.8.orig.tar.gz kuickshow-trinity-3.5.8
 
 binary-post-install/kpdf-trinity::
-	#cp -Rp debian/kpdf-trinity/usr/* debian/kpdf-trinity/opt/trinity/
-	#rm -rf debian/kpdf-trinity/usr/
 	mv debian/kpdf-trinity/usr/share/man debian/kpdf-trinity/opt/trinity/share/
 
 binary-post-install/kghostview-trinity::
-	#cp -Rp debian/kghostview-trinity/usr/* debian/kghostview-trinity/opt/trinity/
-	#rm -rf debian/kghostview-trinity/usr/
 	mv debian/kghostview-trinity/usr/share/man debian/kghostview-trinity/opt/trinity/share/
 
 binary-post-install/kcolorchooser-trinity::
-	#cp -Rp debian/kcolorchooser-trinity/usr/* debian/kcolorchooser-trinity/opt/trinity/
-	#rm -rf debian/kcolorchooser-trinity/usr/
 	mv debian/kcolorchooser-trinity/usr/share/man debian/kcolorchooser-trinity/opt/trinity/share/
 
 binary-post-install/kdvi-trinity::
-	#cp -Rp debian/kdvi-trinity/usr/* debian/kdvi-trinity/opt/trinity/
-	#rm -rf debian/kdvi-trinity/usr/
 	mv debian/kdvi-trinity/usr/share/man debian/kdvi-trinity/opt/trinity/share/
 
 binary-post-install/kfaxview-trinity::
-	#cp -Rp debian/kfaxview-trinity/usr/* debian/kfaxview-trinity/opt/trinity/
-	#rm -rf debian/kfaxview-trinity/usr/	
 	mv debian/kfaxview-trinity/usr/share/man debian/kfaxview-trinity/opt/trinity/share/
 
-binary-post-install/kiconedit-trinity::
-	#cp -Rp debian/kiconedit-trinity/usr/* debian/kiconedit-trinity/opt/trinity/
-	#rm -rf debian/kiconedit-trinity/usr/	
-	mv debian/kiconedit-trinity/usr/share/man debian/kiconedit-trinity/opt/trinity/share/
+binary-post-install/tdeiconedit-trinity::
+	mv debian/tdeiconedit-trinity/usr/share/man debian/tdeiconedit-trinity/opt/trinity/share/
 
 binary-post-install/kooka-trinity::
-	#cp -Rp debian/kooka-trinity/usr/* debian/kooka-trinity/opt/trinity/
-	#rm -rf debian/kooka-trinity/usr/
 	mv debian/kooka-trinity/usr/share/man debian/kooka-trinity/opt/trinity/share/
 
 binary-post-install/kpovmodeler-trinity::
-	#cp -Rp debian/kpovmodeler-trinity/usr/* debian/kpovmodeler-trinity/opt/trinity/
-	#rm -rf debian/kpovmodeler-trinity/usr/
 	mv debian/kpovmodeler-trinity/usr/share/man debian/kpovmodeler-trinity/opt/trinity/share/
 
 binary-post-install/ksnapshot-trinity::
-	#cp -Rp debian/ksnapshot-trinity/usr/* debian/ksnapshot-trinity/opt/trinity/
-	#rm -rf debian/ksnapshot-trinity/usr/
 	mv debian/ksnapshot-trinity/usr/share/man debian/ksnapshot-trinity/opt/trinity/share/
 
 binary-post-install/kview-trinity::
-	#cp -Rp debian/kview-trinity/usr/* debian/kview-trinity/opt/trinity/
-	#rm -rf debian/kview-trinity/usr/
 	mv debian/kview-trinity/usr/share/man debian/kview-trinity/opt/trinity/share/
 
 binary-post-install/kcoloredit-trinity::
-	#cp -Rp debian/kcoloredit-trinity/usr/* debian/kcoloredit-trinity/opt/trinity/
-	#rm -rf debian/kcoloredit-trinity/usr/
 	mv debian/kcoloredit-trinity/usr/share/man debian/kcoloredit-trinity/opt/trinity/share/
 
 binary-post-install/kfax-trinity::
-	#cp -Rp debian/kfax-trinity/usr/* debian/kfax-trinity/opt/trinity/
-	#rm -rf debian/kfax-trinity/usr/
 	mv debian/kfax-trinity/usr/share/man debian/kfax-trinity/opt/trinity/share/
 
 binary-post-install/kolourpaint-trinity::
-	#cp -Rp debian/kolourpaint-trinity/usr/* debian/kolourpaint-trinity/opt/trinity/
-	#rm -rf debian/kolourpaint-trinity/usr/
 	mv debian/kolourpaint-trinity/usr/share/man debian/kolourpaint-trinity/opt/trinity/share/
 
 binary-post-install/kruler-trinity::
-	#cp -Rp debian/kruler-trinity/usr/* debian/kruler-trinity/opt/trinity/
-	#rm -rf debian/kruler-trinity/usr/
 	mv debian/kruler-trinity/usr/share/man debian/kruler-trinity/opt/trinity/share/
 
 binary-post-install/kuickshow-trinity::
-	#cp -Rp debian/kuickshow-trinity/usr/* debian/kuickshow-trinity/opt/trinity/
-	#rm -rf debian/kuickshow-trinity/usr/
 	mv debian/kuickshow-trinity/usr/share/man debian/kuickshow-trinity/opt/trinity/share/
 
 binary-post-install/kviewshell-trinity::
-	#cp -Rp debian/kviewshell-trinity/usr/* debian/kviewshell-trinity/opt/trinity/
-	#rm -rf debian/kviewshell-trinity/usr/
 	mv debian/kviewshell-trinity/usr/share/man debian/kviewshell-trinity/opt/trinity/share/
diff --git a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera
index 9744eea09..e441a4e56 100644
--- a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera
+++ b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera
@@ -5,6 +5,6 @@ Abstract: Kamera allows you to view and download images on a digital camera.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kamera/index.html
-Files: /usr/share/doc/tde/HTML/en/kamera/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kamera/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kamera/*.html
 
diff --git a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit
index df40b406f..23b6ad343 100644
--- a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit
+++ b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit
@@ -6,6 +6,6 @@ Abstract: KColorEdit is a palette files editor. It can be used for editing
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kcoloredit/index.html
-Files: /usr/share/doc/tde/HTML/en/kcoloredit/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kcoloredit/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kcoloredit/*.html
 
diff --git a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi
index a46da2bc7..ae8577c8c 100644
--- a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi
+++ b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi
@@ -5,6 +5,6 @@ Abstract: This program and KPart allow the user to display *.DVI files from TeX.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kdvi/index.html
-Files: /usr/share/doc/tde/HTML/en/kdvi/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kdvi/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kdvi/*.html
 
diff --git a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma
index b8adfa6ba..1c42db775 100644
--- a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma
+++ b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma
@@ -5,6 +5,6 @@ Abstract: KGamma is a simple tool for monitor gamma correction.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kgamma/index.html
-Files: /usr/share/doc/tde/HTML/en/kgamma/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kgamma/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kgamma/*.html
 
diff --git a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview
index d365eafa1..ffb52fadc 100644
--- a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview
+++ b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview
@@ -6,6 +6,6 @@ Abstract: KGhostView displays and prints PostScript and
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kghostview/index.html
-Files: /usr/share/doc/tde/HTML/en/kghostview/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kghostview/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kghostview/*.html
 
diff --git a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint
index 1a60665dd..9fd7868b7 100644
--- a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint
+++ b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint
@@ -5,6 +5,6 @@ Abstract: KolourPaint is a free, easy-to-use paint program for KDE.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kolourpaint/index.html
-Files: /usr/share/doc/tde/HTML/en/kolourpaint/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kolourpaint/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kolourpaint/*.html
 
diff --git a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka
index 08c036a2c..e52e5e494 100644
--- a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka
+++ b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka
@@ -5,6 +5,6 @@ Abstract: Kooka is a very useful KDE scanning application.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kooka/index.html
-Files: /usr/share/doc/tde/HTML/en/kooka/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kooka/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kooka/*.html
 
diff --git a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf
index 973881af0..b3c9b7c8b 100644
--- a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf
+++ b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf
@@ -5,6 +5,6 @@ Abstract: KPDF is a KDE PDF viewer based on xpdf code.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kpdf/index.html
-Files: /usr/share/doc/tde/HTML/en/kpdf/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpdf/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpdf/*.html
 
diff --git a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler
index 7138b349e..943fd3491 100644
--- a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler
+++ b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler
@@ -6,6 +6,6 @@ Abstract: KPovModeler is a graphical 3D modeler, which can generate
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kpovmodeler/index.html
-Files: /usr/share/doc/tde/HTML/en/kpovmodeler/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpovmodeler/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpovmodeler/*.html
 
diff --git a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler
index 2984a7153..b24e03ab3 100644
--- a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler
+++ b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler
@@ -5,6 +5,6 @@ Abstract: KRuler can be used to measure objects on the screen.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kruler/index.html
-Files: /usr/share/doc/tde/HTML/en/kruler/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kruler/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kruler/*.html
 
diff --git a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot
index 12a4246a6..9288e66ec 100644
--- a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot
+++ b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot
@@ -5,6 +5,6 @@ Abstract: KSnapshot is a simple applet for taking screenshots.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/ksnapshot/index.html
-Files: /usr/share/doc/tde/HTML/en/ksnapshot/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/ksnapshot/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/ksnapshot/*.html
 
diff --git a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow
index 6eed1e216..d9d82f118 100644
--- a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow
+++ b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow
@@ -5,6 +5,6 @@ Abstract: KuickShow is a comfortable image browser/viewer.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kuickshow/index.html
-Files: /usr/share/doc/tde/HTML/en/kuickshow/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kuickshow/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kuickshow/*.html
 
diff --git a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview
index acca821b9..7e9cc053e 100644
--- a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview
+++ b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview
@@ -5,6 +5,6 @@ Abstract: KView is an image viewing program.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kview/index.html
-Files: /usr/share/doc/tde/HTML/en/kview/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kview/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kview/*.html
 
diff --git a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kiconedit b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.tdeiconedit
index 6570ceb0d..375bdd8c9 100644
--- a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kiconedit
+++ b/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.tdeiconedit
@@ -1,4 +1,4 @@
-Document: tdegraphics-doc-html-kiconedit
+Document: tdegraphics-doc-html-tdeiconedit
 Title: TDEIconEdit Handbook
 Author: Thomas Tanghus, Lauri Watts
 Abstract: TDEIconEdit is designed to help create icons for KDE using the
@@ -6,6 +6,6 @@ Abstract: TDEIconEdit is designed to help create icons for KDE using the
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kiconedit/index.html
-Files: /usr/share/doc/tde/HTML/en/kiconedit/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/tdeiconedit/*.html
 
diff --git a/debian/lenny/tdegraphics/debian/tdeiconedit-trinity.install b/debian/lenny/tdegraphics/debian/tdeiconedit-trinity.install
new file mode 100644
index 000000000..cb2ca7535
--- /dev/null
+++ b/debian/lenny/tdegraphics/debian/tdeiconedit-trinity.install
@@ -0,0 +1,41 @@
+debian/tmp/opt/trinity/bin/tdeiconedit
+debian/tmp/opt/trinity/share/applications/tde/tdeiconedit.desktop
+debian/tmp/opt/trinity/share/apps/tdeiconedit/tdeiconeditui.rc
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/aim-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/aim.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/airbrush-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/areaselect.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/circle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/colorpicker-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/compressed.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/ellipse.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/eraser-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/fileclose.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/fill-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledcircle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledellipse.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledrectangle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/grayscale.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/grid.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/kdepalette.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/line.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/paintbrush-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/pointer.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/rectangle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/selectcircle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/selectrect.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/source.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/standard.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/transform.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/window_new.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/tdeiconedit-configuration.png
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdeiconedit.png
+
+debian/icons/tdeiconedit.xpm		/opt/trinity/share/pixmaps
+debian/icons/tdeiconedit-16.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/lenny/tdegraphics/debian/tdeiconedit-trinity.manpages b/debian/lenny/tdegraphics/debian/tdeiconedit-trinity.manpages
new file mode 100644
index 000000000..e975ab6b6
--- /dev/null
+++ b/debian/lenny/tdegraphics/debian/tdeiconedit-trinity.manpages
@@ -0,0 +1 @@
+debian/man/tdeiconedit.1
diff --git a/debian/lenny/tdegraphics/debian/tdeiconedit-trinity.menu b/debian/lenny/tdegraphics/debian/tdeiconedit-trinity.menu
new file mode 100644
index 000000000..fd4c9d6fe
--- /dev/null
+++ b/debian/lenny/tdegraphics/debian/tdeiconedit-trinity.menu
@@ -0,0 +1,11 @@
+?package(tdeiconedit-trinity):\
+	needs="X11"\
+	section="Applications/Graphics"\
+	hints="TDE"\
+	title="TDEIconEdit"\
+	icon32x32="/opt/trinity/share/pixmaps/tdeiconedit.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/tdeiconedit-16.xpm"\
+	command="/opt/trinity/bin/tdeiconedit"
+
+# Icon 32x32 tdeiconedit/pics/cr32-app-tdeiconedit.png tdeiconedit.xpm
+# Icon 16x16 tdeiconedit/pics/cr16-app-tdeiconedit.png tdeiconedit-16.xpm
diff --git a/debian/lenny/tdevelop/debian/control b/debian/lenny/tdevelop/debian/control
index f38b94501..e0bbf8bb2 100644
--- a/debian/lenny/tdevelop/debian/control
+++ b/debian/lenny/tdevelop/debian/control
@@ -12,7 +12,7 @@ Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebas
 Replaces: kdevelop-trinity (<< 4:14.0.0~)
 Breaks: kdevelop-trinity (<< 4:14.0.0~)
 Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4)
-Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, kiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
+Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
 Description: An IDE for Unix/X11
  KDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features 
diff --git a/debian/squeeze/metapackages/rename-meta/debian/control b/debian/squeeze/metapackages/rename-meta/debian/control
index 2f739f1cc..cbb957038 100644
--- a/debian/squeeze/metapackages/rename-meta/debian/control
+++ b/debian/squeeze/metapackages/rename-meta/debian/control
@@ -264,6 +264,12 @@ Depends: tdegraphics-trinity-dbg
 Conflicts: kdegraphics-trinity-dbg (<< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
+Package: kiconedit-trinity
+Architecture: all
+Depends: tdeiconedit-trinity
+Conflicts: kiconedit-trinity (<< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
 Package: kdesvn-trinity
 Architecture: all
 Depends: tdesvn-trinity
diff --git a/debian/squeeze/tdegraphics/debian/control b/debian/squeeze/tdegraphics/debian/control
index c1216156b..98da85a33 100644
--- a/debian/squeeze/tdegraphics/debian/control
+++ b/debian/squeeze/tdegraphics/debian/control
@@ -12,7 +12,7 @@ Section: tde
 Architecture: all
 Replaces: kdegraphics-trinity (<< 4:14.0.0~)
 Breaks: kdegraphics-trinity (<< 4:14.0.0~)
-Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-tdefile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), kiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
+Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-tdefile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), tdeiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
 Suggests: tdegraphics-trinity-doc-html (>= ${source:Version})
 Description: graphics apps from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -176,7 +176,7 @@ Description: PostScript viewer for Trinity
  This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
-Package: kiconedit-trinity
+Package: tdeiconedit-trinity
 Section: graphics
 Architecture: any
 Replaces: kiconedit-trinity (<< 4:14.0.0~)
diff --git a/debian/squeeze/tdegraphics/debian/control.in b/debian/squeeze/tdegraphics/debian/control.in
index 88b71b09b..3dd5c6cbe 100644
--- a/debian/squeeze/tdegraphics/debian/control.in
+++ b/debian/squeeze/tdegraphics/debian/control.in
@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: tdegraphics
 Section: tde
 Architecture: all
-Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), tdegraphics-tdefile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), kiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
+Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), tdegraphics-tdefile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), tdeiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
 Suggests: tdegraphics-doc-html (>= ${source:Version})
 Description: graphics apps from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -154,7 +154,7 @@ Description: PostScript viewer for KDE
  This package is part of KDE, as a component of the KDE graphics module.
  See the 'kde' and 'tdegraphics' packages for more information.
 
-Package: kiconedit
+Package: tdeiconedit
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
diff --git a/debian/squeeze/tdegraphics/debian/icons/kiconedit-16.xpm b/debian/squeeze/tdegraphics/debian/icons/tdeiconedit-16.xpm
index 857f5fe1c..1eff4882e 100644
--- a/debian/squeeze/tdegraphics/debian/icons/kiconedit-16.xpm
+++ b/debian/squeeze/tdegraphics/debian/icons/tdeiconedit-16.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *kiconedit-16[] = {
+static char *tdeiconedit-16[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 20 1",
 "  c black",
diff --git a/debian/lenny/tdegraphics/debian/icons/kiconedit.xpm b/debian/squeeze/tdegraphics/debian/icons/tdeiconedit.xpm
index 412544858..7bc8278e4 100644
--- a/debian/lenny/tdegraphics/debian/icons/kiconedit.xpm
+++ b/debian/squeeze/tdegraphics/debian/icons/tdeiconedit.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *kiconedit[] = {
+static char *tdeiconedit[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 242 2",
 "   c #000000",
diff --git a/debian/squeeze/tdegraphics/debian/kcoloredit-trinity.menu b/debian/squeeze/tdegraphics/debian/kcoloredit-trinity.menu
index 24dc70519..0ac64569b 100644
--- a/debian/squeeze/tdegraphics/debian/kcoloredit-trinity.menu
+++ b/debian/squeeze/tdegraphics/debian/kcoloredit-trinity.menu
@@ -1,4 +1,4 @@
-?package(kcoloredit):\
+?package(kcoloredit-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\
@@ -7,7 +7,7 @@
 	icon16x16="/opt/trinity/share/pixmaps/kcolorchooser-16.xpm"\
 	command="/opt/trinity/bin/kcolorchooser"
 
-?package(kcoloredit):\
+?package(kcoloredit-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\
diff --git a/debian/squeeze/tdegraphics/debian/kdvi-trinity.menu b/debian/squeeze/tdegraphics/debian/kdvi-trinity.menu
index f1bfa96a5..0e6e44390 100644
--- a/debian/squeeze/tdegraphics/debian/kdvi-trinity.menu
+++ b/debian/squeeze/tdegraphics/debian/kdvi-trinity.menu
@@ -1,4 +1,4 @@
-?package(kdvi):\
+?package(kdvi-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,DVI,Documents"\
diff --git a/debian/squeeze/tdegraphics/debian/kfax-trinity.menu b/debian/squeeze/tdegraphics/debian/kfax-trinity.menu
index 810a67ff6..f9a2df65c 100644
--- a/debian/squeeze/tdegraphics/debian/kfax-trinity.menu
+++ b/debian/squeeze/tdegraphics/debian/kfax-trinity.menu
@@ -1,4 +1,4 @@
-?package(kfax):\
+?package(kfax-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\
diff --git a/debian/squeeze/tdegraphics/debian/kfaxview-trinity.menu b/debian/squeeze/tdegraphics/debian/kfaxview-trinity.menu
index a44fcd5a1..578a03eb0 100644
--- a/debian/squeeze/tdegraphics/debian/kfaxview-trinity.menu
+++ b/debian/squeeze/tdegraphics/debian/kfaxview-trinity.menu
@@ -1,4 +1,4 @@
-?package(kfaxview):\
+?package(kfaxview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\
diff --git a/debian/squeeze/tdegraphics/debian/kghostview-trinity.menu b/debian/squeeze/tdegraphics/debian/kghostview-trinity.menu
index cd27c5660..c736aadeb 100644
--- a/debian/squeeze/tdegraphics/debian/kghostview-trinity.menu
+++ b/debian/squeeze/tdegraphics/debian/kghostview-trinity.menu
@@ -1,4 +1,4 @@
-?package(kghostview):\
+?package(kghostview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,Documents"\
diff --git a/debian/squeeze/tdegraphics/debian/kiconedit-trinity.install b/debian/squeeze/tdegraphics/debian/kiconedit-trinity.install
deleted file mode 100644
index eebb5b877..000000000
--- a/debian/squeeze/tdegraphics/debian/kiconedit-trinity.install
+++ /dev/null
@@ -1,41 +0,0 @@
-debian/tmp/opt/trinity/bin/kiconedit
-debian/tmp/opt/trinity/share/applications/tde/kiconedit.desktop
-debian/tmp/opt/trinity/share/apps/kiconedit/kiconeditui.rc
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/aim-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/aim.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/airbrush-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/areaselect.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/circle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/colorpicker-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/compressed.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/ellipse.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/eraser-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/fileclose.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/fill-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledcircle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledellipse.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledrectangle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/grayscale.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/grid.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/kdepalette.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/line.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/paintbrush-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/pointer.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/rectangle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/selectcircle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/selectrect.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/source.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/standard.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/transform.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/window_new.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/kiconedit-configuration.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kiconedit.png
-
-debian/icons/kiconedit.xpm		/opt/trinity/share/pixmaps
-debian/icons/kiconedit-16.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/squeeze/tdegraphics/debian/kiconedit-trinity.manpages b/debian/squeeze/tdegraphics/debian/kiconedit-trinity.manpages
deleted file mode 100644
index 2f136ed6c..000000000
--- a/debian/squeeze/tdegraphics/debian/kiconedit-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kiconedit.1
diff --git a/debian/squeeze/tdegraphics/debian/kiconedit-trinity.menu b/debian/squeeze/tdegraphics/debian/kiconedit-trinity.menu
deleted file mode 100644
index 7fb1d2a3b..000000000
--- a/debian/squeeze/tdegraphics/debian/kiconedit-trinity.menu
+++ /dev/null
@@ -1,11 +0,0 @@
-?package(kiconedit):\
-	needs="X11"\
-	section="Applications/Graphics"\
-	hints="TDE"\
-	title="TDEIconEdit"\
-	icon32x32="/opt/trinity/share/pixmaps/kiconedit.xpm"\
-	icon16x16="/opt/trinity/share/pixmaps/kiconedit-16.xpm"\
-	command="/opt/trinity/bin/kiconedit"
-
-# Icon 32x32 kiconedit/pics/cr32-app-kiconedit.png kiconedit.xpm
-# Icon 16x16 kiconedit/pics/cr16-app-kiconedit.png kiconedit-16.xpm
diff --git a/debian/squeeze/tdegraphics/debian/kolourpaint-trinity.menu b/debian/squeeze/tdegraphics/debian/kolourpaint-trinity.menu
index 9372e79f3..e975fb924 100644
--- a/debian/squeeze/tdegraphics/debian/kolourpaint-trinity.menu
+++ b/debian/squeeze/tdegraphics/debian/kolourpaint-trinity.menu
@@ -1,4 +1,4 @@
-?package(kolourpaint):\
+?package(kolourpaint-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\
diff --git a/debian/squeeze/tdegraphics/debian/kooka-trinity.menu b/debian/squeeze/tdegraphics/debian/kooka-trinity.menu
index e922d7a70..7160864c7 100644
--- a/debian/squeeze/tdegraphics/debian/kooka-trinity.menu
+++ b/debian/squeeze/tdegraphics/debian/kooka-trinity.menu
@@ -1,4 +1,4 @@
-?package(kooka):\
+?package(kooka-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\
diff --git a/debian/squeeze/tdegraphics/debian/kpdf-trinity.menu b/debian/squeeze/tdegraphics/debian/kpdf-trinity.menu
index da324176a..2c47592cb 100644
--- a/debian/squeeze/tdegraphics/debian/kpdf-trinity.menu
+++ b/debian/squeeze/tdegraphics/debian/kpdf-trinity.menu
@@ -1,4 +1,4 @@
-?package(kpdf):\
+?package(kpdf-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\
diff --git a/debian/squeeze/tdegraphics/debian/kpovmodeler-trinity.menu b/debian/squeeze/tdegraphics/debian/kpovmodeler-trinity.menu
index 3287726f7..dfbeb0de3 100644
--- a/debian/squeeze/tdegraphics/debian/kpovmodeler-trinity.menu
+++ b/debian/squeeze/tdegraphics/debian/kpovmodeler-trinity.menu
@@ -1,4 +1,4 @@
-?package(kpovmodeler):\
+?package(kpovmodeler-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE,Modeler"\
diff --git a/debian/squeeze/tdegraphics/debian/kruler-trinity.menu b/debian/squeeze/tdegraphics/debian/kruler-trinity.menu
index 906bcae11..3a16985a9 100644
--- a/debian/squeeze/tdegraphics/debian/kruler-trinity.menu
+++ b/debian/squeeze/tdegraphics/debian/kruler-trinity.menu
@@ -1,4 +1,4 @@
-?package(kruler):\
+?package(kruler-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\
diff --git a/debian/squeeze/tdegraphics/debian/ksnapshot-trinity.menu b/debian/squeeze/tdegraphics/debian/ksnapshot-trinity.menu
index b82c77733..b26ad0ebb 100644
--- a/debian/squeeze/tdegraphics/debian/ksnapshot-trinity.menu
+++ b/debian/squeeze/tdegraphics/debian/ksnapshot-trinity.menu
@@ -1,4 +1,4 @@
-?package(ksnapshot):\
+?package(ksnapshot-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\
diff --git a/debian/squeeze/tdegraphics/debian/kuickshow-trinity.menu b/debian/squeeze/tdegraphics/debian/kuickshow-trinity.menu
index ed69377fb..9c1e89437 100644
--- a/debian/squeeze/tdegraphics/debian/kuickshow-trinity.menu
+++ b/debian/squeeze/tdegraphics/debian/kuickshow-trinity.menu
@@ -1,4 +1,4 @@
-?package(kuickshow):\
+?package(kuickshow-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\
diff --git a/debian/squeeze/tdegraphics/debian/kview-trinity.menu b/debian/squeeze/tdegraphics/debian/kview-trinity.menu
index e40a31e43..f4bad022f 100644
--- a/debian/squeeze/tdegraphics/debian/kview-trinity.menu
+++ b/debian/squeeze/tdegraphics/debian/kview-trinity.menu
@@ -1,4 +1,4 @@
-?package(kview):\
+?package(kview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,Images"\
diff --git a/debian/squeeze/tdegraphics/debian/man/kiconedit.1 b/debian/squeeze/tdegraphics/debian/man/tdeiconedit.1
index fd99e9acf..335c1fa0d 100644
--- a/debian/squeeze/tdegraphics/debian/man/kiconedit.1
+++ b/debian/squeeze/tdegraphics/debian/man/tdeiconedit.1
@@ -1,21 +1,21 @@
-.TH KICONEDIT "1" "September 2002" KDE "KDE Application"
+.TH TDEICONEDIT "1" "September 2002" TDE "TDE Application"
 .SH NAME
-kiconedit \- KDE Icon Editor
+tdeiconedit \- TDE Icon Editor
 .SH SYNOPSIS
-.B kiconedit
+.B tdeiconedit
 [\fIQt-options\fR] [\fIKDE-options\fR] [\fIfile(s)\fR]
 .SH DESCRIPTION
 This manual page documents briefly the
 .B TDEIconEdit
-KDE Application.
+TDE Application.
 This manual page was written for the Debian GNU/Linux distribution
 because the original program does not have a manual page.
 .P
 .B TDEIconEdit
-is designed to help create icons for KDE using the standard
+is designed to help create icons for TDE using the standard
 icon palette.  
 .PP
-KDE Icon Editor
+TDE Icon Editor
 .SH AUTHOR
 TDEIconEdit was written by
 .nh
@@ -40,7 +40,7 @@ Show help about options
 \fB\-\-help\-qt\fR
 Show Qt specific options
 .TP
-\fB\-\-help\-kde\fR
+\fB\-\-help\-tde\fR
 Show KDE specific options
 .TP
 \fB\-\-help\-all\fR
@@ -68,7 +68,7 @@ is maintained as a docbook manual.  If the
 .B khelpcenter
 program is properly installed at your site, the command
 .IP
-.B khelpcenter help:/kiconedit
+.B khelpcenter help:/tdeiconedit
 .PP
 should give you access to the complete manual.
 .SH AUTHOR
diff --git a/debian/squeeze/tdegraphics/debian/rules b/debian/squeeze/tdegraphics/debian/rules
index 888760f08..6d3995324 100755
--- a/debian/squeeze/tdegraphics/debian/rules
+++ b/debian/squeeze/tdegraphics/debian/rules
@@ -14,9 +14,21 @@ include /usr/share/cdbs/1/class/cmake.mk
 #include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
--DWITH_TIFF="ON" -DWITH_OPENEXR="ON" -DWITH_PDF="ON" \
--DCMAKE_BUILD_TYPE=RelWithDebInfo
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DLIB_SUFFIX="" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \
+ -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DBUILD_ALL="ON" \
+ -DWITH_TIFF="ON" \
+ -DWITH_OPENEXR="ON" \
+ -DWITH_PDF="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.
@@ -57,81 +69,49 @@ kuickshow-trinity-tar:
 	cd ..; tar zcf kuickshow-trinity_3.5.8.orig.tar.gz kuickshow-trinity-3.5.8
 
 binary-post-install/kpdf-trinity::
-	#cp -Rp debian/kpdf-trinity/usr/* debian/kpdf-trinity/opt/trinity/
-	#rm -rf debian/kpdf-trinity/usr/
 	mv debian/kpdf-trinity/usr/share/man debian/kpdf-trinity/opt/trinity/share/
 
 binary-post-install/kghostview-trinity::
-	#cp -Rp debian/kghostview-trinity/usr/* debian/kghostview-trinity/opt/trinity/
-	#rm -rf debian/kghostview-trinity/usr/
 	mv debian/kghostview-trinity/usr/share/man debian/kghostview-trinity/opt/trinity/share/
 
 binary-post-install/kcolorchooser-trinity::
-	#cp -Rp debian/kcolorchooser-trinity/usr/* debian/kcolorchooser-trinity/opt/trinity/
-	#rm -rf debian/kcolorchooser-trinity/usr/
 	mv debian/kcolorchooser-trinity/usr/share/man debian/kcolorchooser-trinity/opt/trinity/share/
 
 binary-post-install/kdvi-trinity::
-	#cp -Rp debian/kdvi-trinity/usr/* debian/kdvi-trinity/opt/trinity/
-	#rm -rf debian/kdvi-trinity/usr/
 	mv debian/kdvi-trinity/usr/share/man debian/kdvi-trinity/opt/trinity/share/
 
 binary-post-install/kfaxview-trinity::
-	#cp -Rp debian/kfaxview-trinity/usr/* debian/kfaxview-trinity/opt/trinity/
-	#rm -rf debian/kfaxview-trinity/usr/	
 	mv debian/kfaxview-trinity/usr/share/man debian/kfaxview-trinity/opt/trinity/share/
 
-binary-post-install/kiconedit-trinity::
-	#cp -Rp debian/kiconedit-trinity/usr/* debian/kiconedit-trinity/opt/trinity/
-	#rm -rf debian/kiconedit-trinity/usr/	
-	mv debian/kiconedit-trinity/usr/share/man debian/kiconedit-trinity/opt/trinity/share/
+binary-post-install/tdeiconedit-trinity::
+	mv debian/tdeiconedit-trinity/usr/share/man debian/tdeiconedit-trinity/opt/trinity/share/
 
 binary-post-install/kooka-trinity::
-	#cp -Rp debian/kooka-trinity/usr/* debian/kooka-trinity/opt/trinity/
-	#rm -rf debian/kooka-trinity/usr/
 	mv debian/kooka-trinity/usr/share/man debian/kooka-trinity/opt/trinity/share/
 
 binary-post-install/kpovmodeler-trinity::
-	#cp -Rp debian/kpovmodeler-trinity/usr/* debian/kpovmodeler-trinity/opt/trinity/
-	#rm -rf debian/kpovmodeler-trinity/usr/
 	mv debian/kpovmodeler-trinity/usr/share/man debian/kpovmodeler-trinity/opt/trinity/share/
 
 binary-post-install/ksnapshot-trinity::
-	#cp -Rp debian/ksnapshot-trinity/usr/* debian/ksnapshot-trinity/opt/trinity/
-	#rm -rf debian/ksnapshot-trinity/usr/
 	mv debian/ksnapshot-trinity/usr/share/man debian/ksnapshot-trinity/opt/trinity/share/
 
 binary-post-install/kview-trinity::
-	#cp -Rp debian/kview-trinity/usr/* debian/kview-trinity/opt/trinity/
-	#rm -rf debian/kview-trinity/usr/
 	mv debian/kview-trinity/usr/share/man debian/kview-trinity/opt/trinity/share/
 
 binary-post-install/kcoloredit-trinity::
-	#cp -Rp debian/kcoloredit-trinity/usr/* debian/kcoloredit-trinity/opt/trinity/
-	#rm -rf debian/kcoloredit-trinity/usr/
 	mv debian/kcoloredit-trinity/usr/share/man debian/kcoloredit-trinity/opt/trinity/share/
 
 binary-post-install/kfax-trinity::
-	#cp -Rp debian/kfax-trinity/usr/* debian/kfax-trinity/opt/trinity/
-	#rm -rf debian/kfax-trinity/usr/
 	mv debian/kfax-trinity/usr/share/man debian/kfax-trinity/opt/trinity/share/
 
 binary-post-install/kolourpaint-trinity::
-	#cp -Rp debian/kolourpaint-trinity/usr/* debian/kolourpaint-trinity/opt/trinity/
-	#rm -rf debian/kolourpaint-trinity/usr/
 	mv debian/kolourpaint-trinity/usr/share/man debian/kolourpaint-trinity/opt/trinity/share/
 
 binary-post-install/kruler-trinity::
-	#cp -Rp debian/kruler-trinity/usr/* debian/kruler-trinity/opt/trinity/
-	#rm -rf debian/kruler-trinity/usr/
 	mv debian/kruler-trinity/usr/share/man debian/kruler-trinity/opt/trinity/share/
 
 binary-post-install/kuickshow-trinity::
-	#cp -Rp debian/kuickshow-trinity/usr/* debian/kuickshow-trinity/opt/trinity/
-	#rm -rf debian/kuickshow-trinity/usr/
 	mv debian/kuickshow-trinity/usr/share/man debian/kuickshow-trinity/opt/trinity/share/
 
 binary-post-install/kviewshell-trinity::
-	#cp -Rp debian/kviewshell-trinity/usr/* debian/kviewshell-trinity/opt/trinity/
-	#rm -rf debian/kviewshell-trinity/usr/
 	mv debian/kviewshell-trinity/usr/share/man debian/kviewshell-trinity/opt/trinity/share/
diff --git a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera
index 9744eea09..e441a4e56 100644
--- a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera
+++ b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera
@@ -5,6 +5,6 @@ Abstract: Kamera allows you to view and download images on a digital camera.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kamera/index.html
-Files: /usr/share/doc/tde/HTML/en/kamera/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kamera/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kamera/*.html
 
diff --git a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit
index df40b406f..23b6ad343 100644
--- a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit
+++ b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit
@@ -6,6 +6,6 @@ Abstract: KColorEdit is a palette files editor. It can be used for editing
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kcoloredit/index.html
-Files: /usr/share/doc/tde/HTML/en/kcoloredit/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kcoloredit/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kcoloredit/*.html
 
diff --git a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi
index a46da2bc7..ae8577c8c 100644
--- a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi
+++ b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi
@@ -5,6 +5,6 @@ Abstract: This program and KPart allow the user to display *.DVI files from TeX.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kdvi/index.html
-Files: /usr/share/doc/tde/HTML/en/kdvi/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kdvi/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kdvi/*.html
 
diff --git a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma
index b8adfa6ba..1c42db775 100644
--- a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma
+++ b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma
@@ -5,6 +5,6 @@ Abstract: KGamma is a simple tool for monitor gamma correction.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kgamma/index.html
-Files: /usr/share/doc/tde/HTML/en/kgamma/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kgamma/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kgamma/*.html
 
diff --git a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview
index d365eafa1..ffb52fadc 100644
--- a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview
+++ b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview
@@ -6,6 +6,6 @@ Abstract: KGhostView displays and prints PostScript and
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kghostview/index.html
-Files: /usr/share/doc/tde/HTML/en/kghostview/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kghostview/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kghostview/*.html
 
diff --git a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint
index 1a60665dd..9fd7868b7 100644
--- a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint
+++ b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint
@@ -5,6 +5,6 @@ Abstract: KolourPaint is a free, easy-to-use paint program for KDE.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kolourpaint/index.html
-Files: /usr/share/doc/tde/HTML/en/kolourpaint/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kolourpaint/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kolourpaint/*.html
 
diff --git a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka
index 08c036a2c..e52e5e494 100644
--- a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka
+++ b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka
@@ -5,6 +5,6 @@ Abstract: Kooka is a very useful KDE scanning application.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kooka/index.html
-Files: /usr/share/doc/tde/HTML/en/kooka/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kooka/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kooka/*.html
 
diff --git a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf
index 973881af0..b3c9b7c8b 100644
--- a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf
+++ b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf
@@ -5,6 +5,6 @@ Abstract: KPDF is a KDE PDF viewer based on xpdf code.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kpdf/index.html
-Files: /usr/share/doc/tde/HTML/en/kpdf/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpdf/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpdf/*.html
 
diff --git a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler
index 7138b349e..943fd3491 100644
--- a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler
+++ b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler
@@ -6,6 +6,6 @@ Abstract: KPovModeler is a graphical 3D modeler, which can generate
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kpovmodeler/index.html
-Files: /usr/share/doc/tde/HTML/en/kpovmodeler/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpovmodeler/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpovmodeler/*.html
 
diff --git a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler
index 2984a7153..b24e03ab3 100644
--- a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler
+++ b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler
@@ -5,6 +5,6 @@ Abstract: KRuler can be used to measure objects on the screen.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kruler/index.html
-Files: /usr/share/doc/tde/HTML/en/kruler/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kruler/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kruler/*.html
 
diff --git a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot
index 12a4246a6..9288e66ec 100644
--- a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot
+++ b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot
@@ -5,6 +5,6 @@ Abstract: KSnapshot is a simple applet for taking screenshots.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/ksnapshot/index.html
-Files: /usr/share/doc/tde/HTML/en/ksnapshot/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/ksnapshot/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/ksnapshot/*.html
 
diff --git a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow
index 6eed1e216..d9d82f118 100644
--- a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow
+++ b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow
@@ -5,6 +5,6 @@ Abstract: KuickShow is a comfortable image browser/viewer.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kuickshow/index.html
-Files: /usr/share/doc/tde/HTML/en/kuickshow/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kuickshow/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kuickshow/*.html
 
diff --git a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview
index acca821b9..7e9cc053e 100644
--- a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview
+++ b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview
@@ -5,6 +5,6 @@ Abstract: KView is an image viewing program.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kview/index.html
-Files: /usr/share/doc/tde/HTML/en/kview/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kview/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kview/*.html
 
diff --git a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kiconedit b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.tdeiconedit
index 6570ceb0d..375bdd8c9 100644
--- a/debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kiconedit
+++ b/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.tdeiconedit
@@ -1,4 +1,4 @@
-Document: tdegraphics-doc-html-kiconedit
+Document: tdegraphics-doc-html-tdeiconedit
 Title: TDEIconEdit Handbook
 Author: Thomas Tanghus, Lauri Watts
 Abstract: TDEIconEdit is designed to help create icons for KDE using the
@@ -6,6 +6,6 @@ Abstract: TDEIconEdit is designed to help create icons for KDE using the
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kiconedit/index.html
-Files: /usr/share/doc/tde/HTML/en/kiconedit/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/tdeiconedit/*.html
 
diff --git a/debian/squeeze/tdegraphics/debian/tdeiconedit-trinity.install b/debian/squeeze/tdegraphics/debian/tdeiconedit-trinity.install
new file mode 100644
index 000000000..cb2ca7535
--- /dev/null
+++ b/debian/squeeze/tdegraphics/debian/tdeiconedit-trinity.install
@@ -0,0 +1,41 @@
+debian/tmp/opt/trinity/bin/tdeiconedit
+debian/tmp/opt/trinity/share/applications/tde/tdeiconedit.desktop
+debian/tmp/opt/trinity/share/apps/tdeiconedit/tdeiconeditui.rc
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/aim-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/aim.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/airbrush-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/areaselect.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/circle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/colorpicker-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/compressed.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/ellipse.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/eraser-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/fileclose.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/fill-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledcircle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledellipse.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledrectangle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/grayscale.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/grid.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/kdepalette.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/line.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/paintbrush-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/pointer.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/rectangle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/selectcircle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/selectrect.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/source.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/standard.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/transform.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/window_new.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/tdeiconedit-configuration.png
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdeiconedit.png
+
+debian/icons/tdeiconedit.xpm		/opt/trinity/share/pixmaps
+debian/icons/tdeiconedit-16.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/squeeze/tdegraphics/debian/tdeiconedit-trinity.manpages b/debian/squeeze/tdegraphics/debian/tdeiconedit-trinity.manpages
new file mode 100644
index 000000000..e975ab6b6
--- /dev/null
+++ b/debian/squeeze/tdegraphics/debian/tdeiconedit-trinity.manpages
@@ -0,0 +1 @@
+debian/man/tdeiconedit.1
diff --git a/debian/squeeze/tdegraphics/debian/tdeiconedit-trinity.menu b/debian/squeeze/tdegraphics/debian/tdeiconedit-trinity.menu
new file mode 100644
index 000000000..fd4c9d6fe
--- /dev/null
+++ b/debian/squeeze/tdegraphics/debian/tdeiconedit-trinity.menu
@@ -0,0 +1,11 @@
+?package(tdeiconedit-trinity):\
+	needs="X11"\
+	section="Applications/Graphics"\
+	hints="TDE"\
+	title="TDEIconEdit"\
+	icon32x32="/opt/trinity/share/pixmaps/tdeiconedit.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/tdeiconedit-16.xpm"\
+	command="/opt/trinity/bin/tdeiconedit"
+
+# Icon 32x32 tdeiconedit/pics/cr32-app-tdeiconedit.png tdeiconedit.xpm
+# Icon 16x16 tdeiconedit/pics/cr16-app-tdeiconedit.png tdeiconedit-16.xpm
diff --git a/debian/squeeze/tdevelop/debian/control b/debian/squeeze/tdevelop/debian/control
index f38b94501..e0bbf8bb2 100644
--- a/debian/squeeze/tdevelop/debian/control
+++ b/debian/squeeze/tdevelop/debian/control
@@ -12,7 +12,7 @@ Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebas
 Replaces: kdevelop-trinity (<< 4:14.0.0~)
 Breaks: kdevelop-trinity (<< 4:14.0.0~)
 Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4)
-Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, kiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
+Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
 Description: An IDE for Unix/X11
  KDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features 
diff --git a/debian/wheezy/metapackages/rename-meta/debian/control b/debian/wheezy/metapackages/rename-meta/debian/control
index 2f739f1cc..cbb957038 100644
--- a/debian/wheezy/metapackages/rename-meta/debian/control
+++ b/debian/wheezy/metapackages/rename-meta/debian/control
@@ -264,6 +264,12 @@ Depends: tdegraphics-trinity-dbg
 Conflicts: kdegraphics-trinity-dbg (<< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
+Package: kiconedit-trinity
+Architecture: all
+Depends: tdeiconedit-trinity
+Conflicts: kiconedit-trinity (<< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
 Package: kdesvn-trinity
 Architecture: all
 Depends: tdesvn-trinity
diff --git a/debian/wheezy/tdegraphics/debian/control b/debian/wheezy/tdegraphics/debian/control
index c1216156b..98da85a33 100644
--- a/debian/wheezy/tdegraphics/debian/control
+++ b/debian/wheezy/tdegraphics/debian/control
@@ -12,7 +12,7 @@ Section: tde
 Architecture: all
 Replaces: kdegraphics-trinity (<< 4:14.0.0~)
 Breaks: kdegraphics-trinity (<< 4:14.0.0~)
-Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-tdefile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), kiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
+Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-tdefile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), tdeiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
 Suggests: tdegraphics-trinity-doc-html (>= ${source:Version})
 Description: graphics apps from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -176,7 +176,7 @@ Description: PostScript viewer for Trinity
  This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
-Package: kiconedit-trinity
+Package: tdeiconedit-trinity
 Section: graphics
 Architecture: any
 Replaces: kiconedit-trinity (<< 4:14.0.0~)
diff --git a/debian/wheezy/tdegraphics/debian/control.in b/debian/wheezy/tdegraphics/debian/control.in
index 88b71b09b..3dd5c6cbe 100644
--- a/debian/wheezy/tdegraphics/debian/control.in
+++ b/debian/wheezy/tdegraphics/debian/control.in
@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: tdegraphics
 Section: tde
 Architecture: all
-Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), tdegraphics-tdefile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), kiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
+Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), tdegraphics-tdefile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), tdeiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
 Suggests: tdegraphics-doc-html (>= ${source:Version})
 Description: graphics apps from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -154,7 +154,7 @@ Description: PostScript viewer for KDE
  This package is part of KDE, as a component of the KDE graphics module.
  See the 'kde' and 'tdegraphics' packages for more information.
 
-Package: kiconedit
+Package: tdeiconedit
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
diff --git a/debian/wheezy/tdegraphics/debian/icons/kiconedit-16.xpm b/debian/wheezy/tdegraphics/debian/icons/tdeiconedit-16.xpm
index 857f5fe1c..1eff4882e 100644
--- a/debian/wheezy/tdegraphics/debian/icons/kiconedit-16.xpm
+++ b/debian/wheezy/tdegraphics/debian/icons/tdeiconedit-16.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *kiconedit-16[] = {
+static char *tdeiconedit-16[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 20 1",
 "  c black",
diff --git a/debian/wheezy/tdegraphics/debian/icons/kiconedit.xpm b/debian/wheezy/tdegraphics/debian/icons/tdeiconedit.xpm
index 412544858..7bc8278e4 100644
--- a/debian/wheezy/tdegraphics/debian/icons/kiconedit.xpm
+++ b/debian/wheezy/tdegraphics/debian/icons/tdeiconedit.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *kiconedit[] = {
+static char *tdeiconedit[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 242 2",
 "   c #000000",
diff --git a/debian/wheezy/tdegraphics/debian/kcoloredit-trinity.menu b/debian/wheezy/tdegraphics/debian/kcoloredit-trinity.menu
index 24dc70519..0ac64569b 100644
--- a/debian/wheezy/tdegraphics/debian/kcoloredit-trinity.menu
+++ b/debian/wheezy/tdegraphics/debian/kcoloredit-trinity.menu
@@ -1,4 +1,4 @@
-?package(kcoloredit):\
+?package(kcoloredit-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\
@@ -7,7 +7,7 @@
 	icon16x16="/opt/trinity/share/pixmaps/kcolorchooser-16.xpm"\
 	command="/opt/trinity/bin/kcolorchooser"
 
-?package(kcoloredit):\
+?package(kcoloredit-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\
diff --git a/debian/wheezy/tdegraphics/debian/kdvi-trinity.menu b/debian/wheezy/tdegraphics/debian/kdvi-trinity.menu
index f1bfa96a5..0e6e44390 100644
--- a/debian/wheezy/tdegraphics/debian/kdvi-trinity.menu
+++ b/debian/wheezy/tdegraphics/debian/kdvi-trinity.menu
@@ -1,4 +1,4 @@
-?package(kdvi):\
+?package(kdvi-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,DVI,Documents"\
diff --git a/debian/wheezy/tdegraphics/debian/kfax-trinity.menu b/debian/wheezy/tdegraphics/debian/kfax-trinity.menu
index 810a67ff6..f9a2df65c 100644
--- a/debian/wheezy/tdegraphics/debian/kfax-trinity.menu
+++ b/debian/wheezy/tdegraphics/debian/kfax-trinity.menu
@@ -1,4 +1,4 @@
-?package(kfax):\
+?package(kfax-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\
diff --git a/debian/wheezy/tdegraphics/debian/kfaxview-trinity.menu b/debian/wheezy/tdegraphics/debian/kfaxview-trinity.menu
index a44fcd5a1..578a03eb0 100644
--- a/debian/wheezy/tdegraphics/debian/kfaxview-trinity.menu
+++ b/debian/wheezy/tdegraphics/debian/kfaxview-trinity.menu
@@ -1,4 +1,4 @@
-?package(kfaxview):\
+?package(kfaxview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\
diff --git a/debian/wheezy/tdegraphics/debian/kghostview-trinity.menu b/debian/wheezy/tdegraphics/debian/kghostview-trinity.menu
index cd27c5660..c736aadeb 100644
--- a/debian/wheezy/tdegraphics/debian/kghostview-trinity.menu
+++ b/debian/wheezy/tdegraphics/debian/kghostview-trinity.menu
@@ -1,4 +1,4 @@
-?package(kghostview):\
+?package(kghostview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,Documents"\
diff --git a/debian/wheezy/tdegraphics/debian/kiconedit-trinity.install b/debian/wheezy/tdegraphics/debian/kiconedit-trinity.install
deleted file mode 100644
index eebb5b877..000000000
--- a/debian/wheezy/tdegraphics/debian/kiconedit-trinity.install
+++ /dev/null
@@ -1,41 +0,0 @@
-debian/tmp/opt/trinity/bin/kiconedit
-debian/tmp/opt/trinity/share/applications/tde/kiconedit.desktop
-debian/tmp/opt/trinity/share/apps/kiconedit/kiconeditui.rc
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/aim-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/aim.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/airbrush-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/areaselect.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/circle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/colorpicker-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/compressed.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/ellipse.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/eraser-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/fileclose.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/fill-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledcircle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledellipse.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledrectangle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/grayscale.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/grid.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/kdepalette.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/line.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/paintbrush-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/pointer.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/rectangle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/selectcircle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/selectrect.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/source.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/standard.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/transform.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/window_new.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/kiconedit-configuration.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kiconedit.png
-
-debian/icons/kiconedit.xpm		/opt/trinity/share/pixmaps
-debian/icons/kiconedit-16.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/wheezy/tdegraphics/debian/kiconedit-trinity.manpages b/debian/wheezy/tdegraphics/debian/kiconedit-trinity.manpages
deleted file mode 100644
index 2f136ed6c..000000000
--- a/debian/wheezy/tdegraphics/debian/kiconedit-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kiconedit.1
diff --git a/debian/wheezy/tdegraphics/debian/kiconedit-trinity.menu b/debian/wheezy/tdegraphics/debian/kiconedit-trinity.menu
deleted file mode 100644
index 7fb1d2a3b..000000000
--- a/debian/wheezy/tdegraphics/debian/kiconedit-trinity.menu
+++ /dev/null
@@ -1,11 +0,0 @@
-?package(kiconedit):\
-	needs="X11"\
-	section="Applications/Graphics"\
-	hints="TDE"\
-	title="TDEIconEdit"\
-	icon32x32="/opt/trinity/share/pixmaps/kiconedit.xpm"\
-	icon16x16="/opt/trinity/share/pixmaps/kiconedit-16.xpm"\
-	command="/opt/trinity/bin/kiconedit"
-
-# Icon 32x32 kiconedit/pics/cr32-app-kiconedit.png kiconedit.xpm
-# Icon 16x16 kiconedit/pics/cr16-app-kiconedit.png kiconedit-16.xpm
diff --git a/debian/wheezy/tdegraphics/debian/kolourpaint-trinity.menu b/debian/wheezy/tdegraphics/debian/kolourpaint-trinity.menu
index 9372e79f3..e975fb924 100644
--- a/debian/wheezy/tdegraphics/debian/kolourpaint-trinity.menu
+++ b/debian/wheezy/tdegraphics/debian/kolourpaint-trinity.menu
@@ -1,4 +1,4 @@
-?package(kolourpaint):\
+?package(kolourpaint-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\
diff --git a/debian/wheezy/tdegraphics/debian/kooka-trinity.menu b/debian/wheezy/tdegraphics/debian/kooka-trinity.menu
index e922d7a70..7160864c7 100644
--- a/debian/wheezy/tdegraphics/debian/kooka-trinity.menu
+++ b/debian/wheezy/tdegraphics/debian/kooka-trinity.menu
@@ -1,4 +1,4 @@
-?package(kooka):\
+?package(kooka-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\
diff --git a/debian/wheezy/tdegraphics/debian/kpdf-trinity.menu b/debian/wheezy/tdegraphics/debian/kpdf-trinity.menu
index da324176a..2c47592cb 100644
--- a/debian/wheezy/tdegraphics/debian/kpdf-trinity.menu
+++ b/debian/wheezy/tdegraphics/debian/kpdf-trinity.menu
@@ -1,4 +1,4 @@
-?package(kpdf):\
+?package(kpdf-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\
diff --git a/debian/wheezy/tdegraphics/debian/kpovmodeler-trinity.menu b/debian/wheezy/tdegraphics/debian/kpovmodeler-trinity.menu
index 3287726f7..dfbeb0de3 100644
--- a/debian/wheezy/tdegraphics/debian/kpovmodeler-trinity.menu
+++ b/debian/wheezy/tdegraphics/debian/kpovmodeler-trinity.menu
@@ -1,4 +1,4 @@
-?package(kpovmodeler):\
+?package(kpovmodeler-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE,Modeler"\
diff --git a/debian/wheezy/tdegraphics/debian/kruler-trinity.menu b/debian/wheezy/tdegraphics/debian/kruler-trinity.menu
index 906bcae11..3a16985a9 100644
--- a/debian/wheezy/tdegraphics/debian/kruler-trinity.menu
+++ b/debian/wheezy/tdegraphics/debian/kruler-trinity.menu
@@ -1,4 +1,4 @@
-?package(kruler):\
+?package(kruler-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\
diff --git a/debian/wheezy/tdegraphics/debian/ksnapshot-trinity.menu b/debian/wheezy/tdegraphics/debian/ksnapshot-trinity.menu
index b82c77733..b26ad0ebb 100644
--- a/debian/wheezy/tdegraphics/debian/ksnapshot-trinity.menu
+++ b/debian/wheezy/tdegraphics/debian/ksnapshot-trinity.menu
@@ -1,4 +1,4 @@
-?package(ksnapshot):\
+?package(ksnapshot-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\
diff --git a/debian/wheezy/tdegraphics/debian/kuickshow-trinity.menu b/debian/wheezy/tdegraphics/debian/kuickshow-trinity.menu
index ed69377fb..9c1e89437 100644
--- a/debian/wheezy/tdegraphics/debian/kuickshow-trinity.menu
+++ b/debian/wheezy/tdegraphics/debian/kuickshow-trinity.menu
@@ -1,4 +1,4 @@
-?package(kuickshow):\
+?package(kuickshow-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\
diff --git a/debian/wheezy/tdegraphics/debian/kview-trinity.menu b/debian/wheezy/tdegraphics/debian/kview-trinity.menu
index e40a31e43..f4bad022f 100644
--- a/debian/wheezy/tdegraphics/debian/kview-trinity.menu
+++ b/debian/wheezy/tdegraphics/debian/kview-trinity.menu
@@ -1,4 +1,4 @@
-?package(kview):\
+?package(kview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,Images"\
diff --git a/debian/wheezy/tdegraphics/debian/man/kiconedit.1 b/debian/wheezy/tdegraphics/debian/man/tdeiconedit.1
index fd99e9acf..335c1fa0d 100644
--- a/debian/wheezy/tdegraphics/debian/man/kiconedit.1
+++ b/debian/wheezy/tdegraphics/debian/man/tdeiconedit.1
@@ -1,21 +1,21 @@
-.TH KICONEDIT "1" "September 2002" KDE "KDE Application"
+.TH TDEICONEDIT "1" "September 2002" TDE "TDE Application"
 .SH NAME
-kiconedit \- KDE Icon Editor
+tdeiconedit \- TDE Icon Editor
 .SH SYNOPSIS
-.B kiconedit
+.B tdeiconedit
 [\fIQt-options\fR] [\fIKDE-options\fR] [\fIfile(s)\fR]
 .SH DESCRIPTION
 This manual page documents briefly the
 .B TDEIconEdit
-KDE Application.
+TDE Application.
 This manual page was written for the Debian GNU/Linux distribution
 because the original program does not have a manual page.
 .P
 .B TDEIconEdit
-is designed to help create icons for KDE using the standard
+is designed to help create icons for TDE using the standard
 icon palette.  
 .PP
-KDE Icon Editor
+TDE Icon Editor
 .SH AUTHOR
 TDEIconEdit was written by
 .nh
@@ -40,7 +40,7 @@ Show help about options
 \fB\-\-help\-qt\fR
 Show Qt specific options
 .TP
-\fB\-\-help\-kde\fR
+\fB\-\-help\-tde\fR
 Show KDE specific options
 .TP
 \fB\-\-help\-all\fR
@@ -68,7 +68,7 @@ is maintained as a docbook manual.  If the
 .B khelpcenter
 program is properly installed at your site, the command
 .IP
-.B khelpcenter help:/kiconedit
+.B khelpcenter help:/tdeiconedit
 .PP
 should give you access to the complete manual.
 .SH AUTHOR
diff --git a/debian/wheezy/tdegraphics/debian/rules b/debian/wheezy/tdegraphics/debian/rules
index 888760f08..6d3995324 100755
--- a/debian/wheezy/tdegraphics/debian/rules
+++ b/debian/wheezy/tdegraphics/debian/rules
@@ -14,9 +14,21 @@ include /usr/share/cdbs/1/class/cmake.mk
 #include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
--DWITH_TIFF="ON" -DWITH_OPENEXR="ON" -DWITH_PDF="ON" \
--DCMAKE_BUILD_TYPE=RelWithDebInfo
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DLIB_SUFFIX="" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \
+ -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DBUILD_ALL="ON" \
+ -DWITH_TIFF="ON" \
+ -DWITH_OPENEXR="ON" \
+ -DWITH_PDF="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.
@@ -57,81 +69,49 @@ kuickshow-trinity-tar:
 	cd ..; tar zcf kuickshow-trinity_3.5.8.orig.tar.gz kuickshow-trinity-3.5.8
 
 binary-post-install/kpdf-trinity::
-	#cp -Rp debian/kpdf-trinity/usr/* debian/kpdf-trinity/opt/trinity/
-	#rm -rf debian/kpdf-trinity/usr/
 	mv debian/kpdf-trinity/usr/share/man debian/kpdf-trinity/opt/trinity/share/
 
 binary-post-install/kghostview-trinity::
-	#cp -Rp debian/kghostview-trinity/usr/* debian/kghostview-trinity/opt/trinity/
-	#rm -rf debian/kghostview-trinity/usr/
 	mv debian/kghostview-trinity/usr/share/man debian/kghostview-trinity/opt/trinity/share/
 
 binary-post-install/kcolorchooser-trinity::
-	#cp -Rp debian/kcolorchooser-trinity/usr/* debian/kcolorchooser-trinity/opt/trinity/
-	#rm -rf debian/kcolorchooser-trinity/usr/
 	mv debian/kcolorchooser-trinity/usr/share/man debian/kcolorchooser-trinity/opt/trinity/share/
 
 binary-post-install/kdvi-trinity::
-	#cp -Rp debian/kdvi-trinity/usr/* debian/kdvi-trinity/opt/trinity/
-	#rm -rf debian/kdvi-trinity/usr/
 	mv debian/kdvi-trinity/usr/share/man debian/kdvi-trinity/opt/trinity/share/
 
 binary-post-install/kfaxview-trinity::
-	#cp -Rp debian/kfaxview-trinity/usr/* debian/kfaxview-trinity/opt/trinity/
-	#rm -rf debian/kfaxview-trinity/usr/	
 	mv debian/kfaxview-trinity/usr/share/man debian/kfaxview-trinity/opt/trinity/share/
 
-binary-post-install/kiconedit-trinity::
-	#cp -Rp debian/kiconedit-trinity/usr/* debian/kiconedit-trinity/opt/trinity/
-	#rm -rf debian/kiconedit-trinity/usr/	
-	mv debian/kiconedit-trinity/usr/share/man debian/kiconedit-trinity/opt/trinity/share/
+binary-post-install/tdeiconedit-trinity::
+	mv debian/tdeiconedit-trinity/usr/share/man debian/tdeiconedit-trinity/opt/trinity/share/
 
 binary-post-install/kooka-trinity::
-	#cp -Rp debian/kooka-trinity/usr/* debian/kooka-trinity/opt/trinity/
-	#rm -rf debian/kooka-trinity/usr/
 	mv debian/kooka-trinity/usr/share/man debian/kooka-trinity/opt/trinity/share/
 
 binary-post-install/kpovmodeler-trinity::
-	#cp -Rp debian/kpovmodeler-trinity/usr/* debian/kpovmodeler-trinity/opt/trinity/
-	#rm -rf debian/kpovmodeler-trinity/usr/
 	mv debian/kpovmodeler-trinity/usr/share/man debian/kpovmodeler-trinity/opt/trinity/share/
 
 binary-post-install/ksnapshot-trinity::
-	#cp -Rp debian/ksnapshot-trinity/usr/* debian/ksnapshot-trinity/opt/trinity/
-	#rm -rf debian/ksnapshot-trinity/usr/
 	mv debian/ksnapshot-trinity/usr/share/man debian/ksnapshot-trinity/opt/trinity/share/
 
 binary-post-install/kview-trinity::
-	#cp -Rp debian/kview-trinity/usr/* debian/kview-trinity/opt/trinity/
-	#rm -rf debian/kview-trinity/usr/
 	mv debian/kview-trinity/usr/share/man debian/kview-trinity/opt/trinity/share/
 
 binary-post-install/kcoloredit-trinity::
-	#cp -Rp debian/kcoloredit-trinity/usr/* debian/kcoloredit-trinity/opt/trinity/
-	#rm -rf debian/kcoloredit-trinity/usr/
 	mv debian/kcoloredit-trinity/usr/share/man debian/kcoloredit-trinity/opt/trinity/share/
 
 binary-post-install/kfax-trinity::
-	#cp -Rp debian/kfax-trinity/usr/* debian/kfax-trinity/opt/trinity/
-	#rm -rf debian/kfax-trinity/usr/
 	mv debian/kfax-trinity/usr/share/man debian/kfax-trinity/opt/trinity/share/
 
 binary-post-install/kolourpaint-trinity::
-	#cp -Rp debian/kolourpaint-trinity/usr/* debian/kolourpaint-trinity/opt/trinity/
-	#rm -rf debian/kolourpaint-trinity/usr/
 	mv debian/kolourpaint-trinity/usr/share/man debian/kolourpaint-trinity/opt/trinity/share/
 
 binary-post-install/kruler-trinity::
-	#cp -Rp debian/kruler-trinity/usr/* debian/kruler-trinity/opt/trinity/
-	#rm -rf debian/kruler-trinity/usr/
 	mv debian/kruler-trinity/usr/share/man debian/kruler-trinity/opt/trinity/share/
 
 binary-post-install/kuickshow-trinity::
-	#cp -Rp debian/kuickshow-trinity/usr/* debian/kuickshow-trinity/opt/trinity/
-	#rm -rf debian/kuickshow-trinity/usr/
 	mv debian/kuickshow-trinity/usr/share/man debian/kuickshow-trinity/opt/trinity/share/
 
 binary-post-install/kviewshell-trinity::
-	#cp -Rp debian/kviewshell-trinity/usr/* debian/kviewshell-trinity/opt/trinity/
-	#rm -rf debian/kviewshell-trinity/usr/
 	mv debian/kviewshell-trinity/usr/share/man debian/kviewshell-trinity/opt/trinity/share/
diff --git a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera
index 9744eea09..e441a4e56 100644
--- a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera
+++ b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera
@@ -5,6 +5,6 @@ Abstract: Kamera allows you to view and download images on a digital camera.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kamera/index.html
-Files: /usr/share/doc/tde/HTML/en/kamera/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kamera/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kamera/*.html
 
diff --git a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit
index df40b406f..23b6ad343 100644
--- a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit
+++ b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit
@@ -6,6 +6,6 @@ Abstract: KColorEdit is a palette files editor. It can be used for editing
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kcoloredit/index.html
-Files: /usr/share/doc/tde/HTML/en/kcoloredit/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kcoloredit/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kcoloredit/*.html
 
diff --git a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi
index a46da2bc7..ae8577c8c 100644
--- a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi
+++ b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi
@@ -5,6 +5,6 @@ Abstract: This program and KPart allow the user to display *.DVI files from TeX.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kdvi/index.html
-Files: /usr/share/doc/tde/HTML/en/kdvi/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kdvi/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kdvi/*.html
 
diff --git a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma
index b8adfa6ba..1c42db775 100644
--- a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma
+++ b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma
@@ -5,6 +5,6 @@ Abstract: KGamma is a simple tool for monitor gamma correction.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kgamma/index.html
-Files: /usr/share/doc/tde/HTML/en/kgamma/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kgamma/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kgamma/*.html
 
diff --git a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview
index d365eafa1..ffb52fadc 100644
--- a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview
+++ b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview
@@ -6,6 +6,6 @@ Abstract: KGhostView displays and prints PostScript and
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kghostview/index.html
-Files: /usr/share/doc/tde/HTML/en/kghostview/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kghostview/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kghostview/*.html
 
diff --git a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint
index 1a60665dd..9fd7868b7 100644
--- a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint
+++ b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint
@@ -5,6 +5,6 @@ Abstract: KolourPaint is a free, easy-to-use paint program for KDE.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kolourpaint/index.html
-Files: /usr/share/doc/tde/HTML/en/kolourpaint/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kolourpaint/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kolourpaint/*.html
 
diff --git a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka
index 08c036a2c..e52e5e494 100644
--- a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka
+++ b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka
@@ -5,6 +5,6 @@ Abstract: Kooka is a very useful KDE scanning application.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kooka/index.html
-Files: /usr/share/doc/tde/HTML/en/kooka/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kooka/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kooka/*.html
 
diff --git a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf
index 973881af0..b3c9b7c8b 100644
--- a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf
+++ b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf
@@ -5,6 +5,6 @@ Abstract: KPDF is a KDE PDF viewer based on xpdf code.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kpdf/index.html
-Files: /usr/share/doc/tde/HTML/en/kpdf/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpdf/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpdf/*.html
 
diff --git a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler
index 7138b349e..943fd3491 100644
--- a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler
+++ b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler
@@ -6,6 +6,6 @@ Abstract: KPovModeler is a graphical 3D modeler, which can generate
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kpovmodeler/index.html
-Files: /usr/share/doc/tde/HTML/en/kpovmodeler/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpovmodeler/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpovmodeler/*.html
 
diff --git a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler
index 2984a7153..b24e03ab3 100644
--- a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler
+++ b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler
@@ -5,6 +5,6 @@ Abstract: KRuler can be used to measure objects on the screen.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kruler/index.html
-Files: /usr/share/doc/tde/HTML/en/kruler/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kruler/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kruler/*.html
 
diff --git a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot
index 12a4246a6..9288e66ec 100644
--- a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot
+++ b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot
@@ -5,6 +5,6 @@ Abstract: KSnapshot is a simple applet for taking screenshots.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/ksnapshot/index.html
-Files: /usr/share/doc/tde/HTML/en/ksnapshot/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/ksnapshot/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/ksnapshot/*.html
 
diff --git a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow
index 6eed1e216..d9d82f118 100644
--- a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow
+++ b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow
@@ -5,6 +5,6 @@ Abstract: KuickShow is a comfortable image browser/viewer.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kuickshow/index.html
-Files: /usr/share/doc/tde/HTML/en/kuickshow/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kuickshow/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kuickshow/*.html
 
diff --git a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview
index acca821b9..7e9cc053e 100644
--- a/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview
+++ b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview
@@ -5,6 +5,6 @@ Abstract: KView is an image viewing program.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kview/index.html
-Files: /usr/share/doc/tde/HTML/en/kview/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kview/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kview/*.html
 
diff --git a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kiconedit b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.tdeiconedit
index 6570ceb0d..375bdd8c9 100644
--- a/debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kiconedit
+++ b/debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.tdeiconedit
@@ -1,4 +1,4 @@
-Document: tdegraphics-doc-html-kiconedit
+Document: tdegraphics-doc-html-tdeiconedit
 Title: TDEIconEdit Handbook
 Author: Thomas Tanghus, Lauri Watts
 Abstract: TDEIconEdit is designed to help create icons for KDE using the
@@ -6,6 +6,6 @@ Abstract: TDEIconEdit is designed to help create icons for KDE using the
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kiconedit/index.html
-Files: /usr/share/doc/tde/HTML/en/kiconedit/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/tdeiconedit/*.html
 
diff --git a/debian/wheezy/tdegraphics/debian/tdeiconedit-trinity.install b/debian/wheezy/tdegraphics/debian/tdeiconedit-trinity.install
new file mode 100644
index 000000000..cb2ca7535
--- /dev/null
+++ b/debian/wheezy/tdegraphics/debian/tdeiconedit-trinity.install
@@ -0,0 +1,41 @@
+debian/tmp/opt/trinity/bin/tdeiconedit
+debian/tmp/opt/trinity/share/applications/tde/tdeiconedit.desktop
+debian/tmp/opt/trinity/share/apps/tdeiconedit/tdeiconeditui.rc
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/aim-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/aim.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/airbrush-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/areaselect.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/circle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/colorpicker-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/compressed.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/ellipse.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/eraser-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/fileclose.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/fill-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledcircle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledellipse.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledrectangle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/grayscale.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/grid.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/kdepalette.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/line.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/paintbrush-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/pointer.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/rectangle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/selectcircle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/selectrect.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/source.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/standard.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/transform.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/window_new.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/tdeiconedit-configuration.png
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdeiconedit.png
+
+debian/icons/tdeiconedit.xpm		/opt/trinity/share/pixmaps
+debian/icons/tdeiconedit-16.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/wheezy/tdegraphics/debian/tdeiconedit-trinity.manpages b/debian/wheezy/tdegraphics/debian/tdeiconedit-trinity.manpages
new file mode 100644
index 000000000..e975ab6b6
--- /dev/null
+++ b/debian/wheezy/tdegraphics/debian/tdeiconedit-trinity.manpages
@@ -0,0 +1 @@
+debian/man/tdeiconedit.1
diff --git a/debian/wheezy/tdegraphics/debian/tdeiconedit-trinity.menu b/debian/wheezy/tdegraphics/debian/tdeiconedit-trinity.menu
new file mode 100644
index 000000000..fd4c9d6fe
--- /dev/null
+++ b/debian/wheezy/tdegraphics/debian/tdeiconedit-trinity.menu
@@ -0,0 +1,11 @@
+?package(tdeiconedit-trinity):\
+	needs="X11"\
+	section="Applications/Graphics"\
+	hints="TDE"\
+	title="TDEIconEdit"\
+	icon32x32="/opt/trinity/share/pixmaps/tdeiconedit.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/tdeiconedit-16.xpm"\
+	command="/opt/trinity/bin/tdeiconedit"
+
+# Icon 32x32 tdeiconedit/pics/cr32-app-tdeiconedit.png tdeiconedit.xpm
+# Icon 16x16 tdeiconedit/pics/cr16-app-tdeiconedit.png tdeiconedit-16.xpm
diff --git a/debian/wheezy/tdevelop/debian/control b/debian/wheezy/tdevelop/debian/control
index f38b94501..e0bbf8bb2 100644
--- a/debian/wheezy/tdevelop/debian/control
+++ b/debian/wheezy/tdevelop/debian/control
@@ -12,7 +12,7 @@ Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebas
 Replaces: kdevelop-trinity (<< 4:14.0.0~)
 Breaks: kdevelop-trinity (<< 4:14.0.0~)
 Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4)
-Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, kiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
+Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
 Description: An IDE for Unix/X11
  KDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features