Fix inadvertent moving files from /usr in tdegraphics in Debian and Ubuntu

29 files changed, 110 insertions, 94 deletions

diff --git a/ubuntu/maverick/tdegraphics/debian/kcoloredit-trinity.install b/ubuntu/maverick/tdegraphics/debian/kcoloredit-trinity.install
index e872d0f06..c760fe7d7 100644
--- a/ubuntu/maverick/tdegraphics/debian/kcoloredit-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kcoloredit-trinity.install
@@ -11,7 +11,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kcoloredit.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kcolorchooser.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kcoloredit.png
 
-debian/icons/kcolorchooser.xpm		/usr/share/pixmaps
-debian/icons/kcolorchooser-16.xpm	/usr/share/pixmaps
-debian/icons/kcoloredit.xpm		/usr/share/pixmaps
-debian/icons/kcoloredit-16.xpm		/usr/share/pixmaps
+debian/icons/kcolorchooser.xpm		/opt/trinity/share/pixmaps
+debian/icons/kcolorchooser-16.xpm	/opt/trinity/share/pixmaps
+debian/icons/kcoloredit.xpm		/opt/trinity/share/pixmaps
+debian/icons/kcoloredit-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegraphics/debian/kcoloredit-trinity.menu b/ubuntu/maverick/tdegraphics/debian/kcoloredit-trinity.menu
index 73907fedd..24dc70519 100644
--- a/ubuntu/maverick/tdegraphics/debian/kcoloredit-trinity.menu
+++ b/ubuntu/maverick/tdegraphics/debian/kcoloredit-trinity.menu
@@ -3,8 +3,8 @@
 	section="Applications/Graphics"\
 	hints="TDE"\
 	title="KColorChooser"\
-	icon32x32="/usr/share/pixmaps/kcolorchooser.xpm"\
-	icon16x16="/usr/share/pixmaps/kcolorchooser-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kcolorchooser.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kcolorchooser-16.xpm"\
 	command="/opt/trinity/bin/kcolorchooser"
 
 ?package(kcoloredit):\
@@ -12,8 +12,8 @@
 	section="Applications/Graphics"\
 	hints="TDE"\
 	title="KColorEdit"\
-	icon32x32="/usr/share/pixmaps/kcoloredit.xpm"\
-	icon16x16="/usr/share/pixmaps/kcoloredit-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kcoloredit.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kcoloredit-16.xpm"\
 	command="/opt/trinity/bin/kcoloredit"
 
 # Icon 22x22 kcoloredit/cr22-app-kcolorchooser.png kcolorchooser.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/kdvi-trinity.install b/ubuntu/maverick/tdegraphics/debian/kdvi-trinity.install
index 7e92db06e..0eeb3b15f 100644
--- a/ubuntu/maverick/tdegraphics/debian/kdvi-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kdvi-trinity.install
@@ -24,5 +24,5 @@ debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kdvi.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kdvi.svgz
 debian/tmp/opt/trinity/share/services/kdvimultipage.desktop
 
-debian/icons/kdvi.xpm		/usr/share/pixmaps
-debian/icons/kdvi-16.xpm	/usr/share/pixmaps
+debian/icons/kdvi.xpm		/opt/trinity/share/pixmaps
+debian/icons/kdvi-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegraphics/debian/kdvi-trinity.menu b/ubuntu/maverick/tdegraphics/debian/kdvi-trinity.menu
index fd6a7d3be..ff4a21a01 100644
--- a/ubuntu/maverick/tdegraphics/debian/kdvi-trinity.menu
+++ b/ubuntu/maverick/tdegraphics/debian/kdvi-trinity.menu
@@ -3,8 +3,8 @@
 	section="Applications/Viewers"\
 	hints="KDE,DVI,Documents"\
 	title="KDVI"\
-	icon32x32="/usr/share/pixmaps/kdvi.xpm"\
-	icon16x16="/usr/share/pixmaps/kdvi-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kdvi.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kdvi-16.xpm"\
 	command="/opt/trinity/bin/kdvi"
 
 # Icon 32x32 kdvi/pix/cr32-app-kdvi.png kdvi.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/kfax-trinity.install b/ubuntu/maverick/tdegraphics/debian/kfax-trinity.install
index f52d708dc..c38b88569 100644
--- a/ubuntu/maverick/tdegraphics/debian/kfax-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kfax-trinity.install
@@ -9,5 +9,5 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kfax.svgz
 
-debian/icons/kfax.xpm		/usr/share/pixmaps
-debian/icons/kfax-16.xpm	/usr/share/pixmaps
+debian/icons/kfax.xpm		/opt/trinity/share/pixmaps
+debian/icons/kfax-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegraphics/debian/kfax-trinity.menu b/ubuntu/maverick/tdegraphics/debian/kfax-trinity.menu
index 344e227f7..810a67ff6 100644
--- a/ubuntu/maverick/tdegraphics/debian/kfax-trinity.menu
+++ b/ubuntu/maverick/tdegraphics/debian/kfax-trinity.menu
@@ -3,8 +3,8 @@
 	section="Applications/Viewers"\
 	hints="TDE"\
 	title="KFax"\
-	icon32x32="/usr/share/pixmaps/kfax.xpm"\
-	icon16x16="/usr/share/pixmaps/kfax-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kfax.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kfax-16.xpm"\
 	command="/opt/trinity/bin/kfax"
 
 # Icon 32x32 kfax/cr32-app-kfax.png kfax.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/kfaxview-trinity.install b/ubuntu/maverick/tdegraphics/debian/kfaxview-trinity.install
index 3327b7fe0..90e21b08c 100644
--- a/ubuntu/maverick/tdegraphics/debian/kfaxview-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kfaxview-trinity.install
@@ -13,5 +13,5 @@ debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kfaxview.svgz
 debian/tmp/opt/trinity/share/services/kfaxmultipage.desktop
 debian/tmp/opt/trinity/share/services/kfaxmultipage_tiff.desktop
 
-debian/icons/kfaxview.xpm           /usr/share/pixmaps
-debian/icons/kfaxview-16.xpm        /usr/share/pixmaps
+debian/icons/kfaxview.xpm           /opt/trinity/share/pixmaps
+debian/icons/kfaxview-16.xpm        /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegraphics/debian/kfaxview-trinity.menu b/ubuntu/maverick/tdegraphics/debian/kfaxview-trinity.menu
index edc02c8d2..a44fcd5a1 100644
--- a/ubuntu/maverick/tdegraphics/debian/kfaxview-trinity.menu
+++ b/ubuntu/maverick/tdegraphics/debian/kfaxview-trinity.menu
@@ -3,8 +3,8 @@
 	section="Applications/Viewers"\
 	hints="TDE"\
 	title="KFaxView"\
-	icon32x32="/usr/share/pixmaps/kfaxview.xpm"\
-	icon16x16="/usr/share/pixmaps/kfaxview-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kfaxview.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kfaxview-16.xpm"\
 	command="/opt/trinity/bin/kfaxview"
 
 # Icon 32x32 kfaxview/hi32-app-kfaxview.png kfaxview.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.install b/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.install
index 59cf101cf..276a7bced 100644
--- a/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.install
@@ -21,5 +21,5 @@ debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kghostview.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kghostview.png
 debian/tmp/opt/trinity/share/services/kghostview_part.desktop
 
-debian/icons/kghostview.xpm		/usr/share/pixmaps
-debian/icons/kghostview-16.xpm		/usr/share/pixmaps
+debian/icons/kghostview.xpm		/opt/trinity/share/pixmaps
+debian/icons/kghostview-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.menu b/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.menu
index 70467d3f7..b6398cbaf 100644
--- a/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.menu
+++ b/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.menu
@@ -3,8 +3,8 @@
 	section="Applications/Viewers"\
 	hints="KDE,Documents"\
 	title="KGhostView"\
-	icon32x32="/usr/share/pixmaps/kghostview.xpm"\
-	icon16x16="/usr/share/pixmaps/kghostview-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kghostview.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kghostview-16.xpm"\
 	command="/opt/trinity/bin/kghostview"
 
 # Icon 32x32 kghostview/cr32-app-kghostview.png kghostview.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/kiconedit-trinity.install b/ubuntu/maverick/tdegraphics/debian/kiconedit-trinity.install
index aa55810f2..eebb5b877 100644
--- a/ubuntu/maverick/tdegraphics/debian/kiconedit-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kiconedit-trinity.install
@@ -37,5 +37,5 @@ 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		/usr/share/pixmaps
-debian/icons/kiconedit-16.xpm		/usr/share/pixmaps
+debian/icons/kiconedit.xpm		/opt/trinity/share/pixmaps
+debian/icons/kiconedit-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegraphics/debian/kiconedit-trinity.menu b/ubuntu/maverick/tdegraphics/debian/kiconedit-trinity.menu
index 34118bfb2..f14559075 100644
--- a/ubuntu/maverick/tdegraphics/debian/kiconedit-trinity.menu
+++ b/ubuntu/maverick/tdegraphics/debian/kiconedit-trinity.menu
@@ -3,8 +3,8 @@
 	section="Applications/Graphics"\
 	hints="TDE"\
 	title="KIconEdit"\
-	icon32x32="/usr/share/pixmaps/kiconedit.xpm"\
-	icon16x16="/usr/share/pixmaps/kiconedit-16.xpm"\
+	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
diff --git a/ubuntu/maverick/tdegraphics/debian/kolourpaint-trinity.install b/ubuntu/maverick/tdegraphics/debian/kolourpaint-trinity.install
index c0570adad..0f1bc5dcc 100644
--- a/ubuntu/maverick/tdegraphics/debian/kolourpaint-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kolourpaint-trinity.install
@@ -168,5 +168,5 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kolourpaint.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kolourpaint.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kolourpaint.svgz
 
-debian/icons/kolourpaint.xpm		/usr/share/pixmaps
-debian/icons/kolourpaint-16.xpm		/usr/share/pixmaps
+debian/icons/kolourpaint.xpm		/opt/trinity/share/pixmaps
+debian/icons/kolourpaint-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegraphics/debian/kolourpaint-trinity.menu b/ubuntu/maverick/tdegraphics/debian/kolourpaint-trinity.menu
index 53e88edba..9372e79f3 100644
--- a/ubuntu/maverick/tdegraphics/debian/kolourpaint-trinity.menu
+++ b/ubuntu/maverick/tdegraphics/debian/kolourpaint-trinity.menu
@@ -3,8 +3,8 @@
 	section="Applications/Graphics"\
 	hints="TDE"\
 	title="KolourPaint"\
-	icon32x32="/usr/share/pixmaps/kolourpaint.xpm"\
-	icon16x16="/usr/share/pixmaps/kolourpaint-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kolourpaint.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kolourpaint-16.xpm"\
 	command="/opt/trinity/bin/kolourpaint"
 
 # Icon 32x32 kolourpaint/pics/hi32-app-kolourpaint.png kolourpaint.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/kooka-trinity.install b/ubuntu/maverick/tdegraphics/debian/kooka-trinity.install
index ad1854179..5330dc6ab 100644
--- a/ubuntu/maverick/tdegraphics/debian/kooka-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kooka-trinity.install
@@ -28,5 +28,5 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/toolbar.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/toolbar1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/toolbar2.png
 
-debian/icons/kooka.xpm		/usr/share/pixmaps
-debian/icons/kooka-16.xpm	/usr/share/pixmaps
+debian/icons/kooka.xpm		/opt/trinity/share/pixmaps
+debian/icons/kooka-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegraphics/debian/kooka-trinity.menu b/ubuntu/maverick/tdegraphics/debian/kooka-trinity.menu
index 63fcecea8..e922d7a70 100644
--- a/ubuntu/maverick/tdegraphics/debian/kooka-trinity.menu
+++ b/ubuntu/maverick/tdegraphics/debian/kooka-trinity.menu
@@ -3,9 +3,9 @@
 	section="Applications/Graphics"\
 	hints="TDE"\
 	title="Kooka"\
-	icon32x32="/usr/share/pixmaps/kooka.xpm"\
-	icon16x16="/usr/share/pixmaps/kooka-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kooka.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kooka-16.xpm"\
 	command="/opt/trinity/bin/kooka"
 
-# Icon 32x32 /usr/share/icons/crystalsvg/32x32/devices/scanner.png kooka.xpm
-# Icon 16x16 /usr/share/icons/crystalsvg/16x16/devices/scanner.png kooka-16.xpm
+# Icon 32x32 /opt/trinity/share/icons/crystalsvg/32x32/devices/scanner.png kooka.xpm
+# Icon 16x16 /opt/trinity/share/icons/crystalsvg/16x16/devices/scanner.png kooka-16.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/kpdf-trinity.install b/ubuntu/maverick/tdegraphics/debian/kpdf-trinity.install
index 6b7eaec8c..640ebdb6e 100644
--- a/ubuntu/maverick/tdegraphics/debian/kpdf-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kpdf-trinity.install
@@ -18,5 +18,5 @@ debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kpdf.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kpdf.svgz
 debian/tmp/opt/trinity/share/services/kpdf_part.desktop
 
-debian/icons/kpdf.xpm		/usr/share/pixmaps
-debian/icons/kpdf-16.xpm	/usr/share/pixmaps
+debian/icons/kpdf.xpm		/opt/trinity/share/pixmaps
+debian/icons/kpdf-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegraphics/debian/kpdf-trinity.menu b/ubuntu/maverick/tdegraphics/debian/kpdf-trinity.menu
index 971b89101..da324176a 100644
--- a/ubuntu/maverick/tdegraphics/debian/kpdf-trinity.menu
+++ b/ubuntu/maverick/tdegraphics/debian/kpdf-trinity.menu
@@ -3,8 +3,8 @@
 	section="Applications/Viewers"\
 	hints="TDE"\
 	title="KPDF"\
-	icon32x32="/usr/share/pixmaps/kpdf.xpm"\
-	icon16x16="/usr/share/pixmaps/kpdf-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kpdf.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kpdf-16.xpm"\
 	command="/opt/trinity/bin/kpdf"
 
 # Icon 32x32 kpdf/cr32-app-kpdf.png kpdf.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.install b/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.install
index 5249f68c1..4cbc774ae 100644
--- a/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.install
@@ -422,5 +422,5 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kpovmodeler_doc.pn
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
 
-debian/icons/kpovmodeler.xpm		/usr/share/pixmaps
-debian/icons/kpovmodeler-16.xpm		/usr/share/pixmaps
+debian/icons/kpovmodeler.xpm		/opt/trinity/share/pixmaps
+debian/icons/kpovmodeler-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.menu b/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.menu
index 2ac1d39a7..5e1179c29 100644
--- a/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.menu
+++ b/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.menu
@@ -3,8 +3,8 @@
 	section="Applications/Graphics"\
 	hints="KDE,Modeler"\
 	title="KPovModeler"\
-	icon32x32="/usr/share/pixmaps/kpovmodeler.xpm"\
-	icon16x16="/usr/share/pixmaps/kpovmodeler-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kpovmodeler.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kpovmodeler-16.xpm"\
 	command="/opt/trinity/bin/kpovmodeler"
 
 # Icon 32x32 kpovmodeler/cr32-app-kpovmodeler.png kpovmodeler.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/kruler-trinity.install b/ubuntu/maverick/tdegraphics/debian/kruler-trinity.install
index b5d49cc81..87fa208d5 100644
--- a/ubuntu/maverick/tdegraphics/debian/kruler-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kruler-trinity.install
@@ -15,5 +15,5 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kruler.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kruler.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kruler.png
 
-debian/icons/kruler.xpm		/usr/share/pixmaps
-debian/icons/kruler-16.xpm	/usr/share/pixmaps
+debian/icons/kruler.xpm		/opt/trinity/share/pixmaps
+debian/icons/kruler-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegraphics/debian/kruler-trinity.menu b/ubuntu/maverick/tdegraphics/debian/kruler-trinity.menu
index 0f1e9c2c1..906bcae11 100644
--- a/ubuntu/maverick/tdegraphics/debian/kruler-trinity.menu
+++ b/ubuntu/maverick/tdegraphics/debian/kruler-trinity.menu
@@ -3,8 +3,8 @@
 	section="Applications/Viewers"\
 	hints="TDE"\
 	title="KRuler"\
-	icon32x32="/usr/share/pixmaps/kruler.xpm"\
-	icon16x16="/usr/share/pixmaps/kruler-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kruler.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kruler-16.xpm"\
 	command="/opt/trinity/bin/kruler"
 
 # Icon 32x32 kruler/pics/cr32-app-kruler.png kruler.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/ksnapshot-trinity.install b/ubuntu/maverick/tdegraphics/debian/ksnapshot-trinity.install
index acdcc61d5..9725e1d31 100644
--- a/ubuntu/maverick/tdegraphics/debian/ksnapshot-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/ksnapshot-trinity.install
@@ -11,5 +11,5 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/ksnapshot.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/ksnapshot.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/ksnapshot.svgz
 
-debian/icons/ksnapshot.xpm		/usr/share/pixmaps
-debian/icons/ksnapshot-16.xpm		/usr/share/pixmaps
+debian/icons/ksnapshot.xpm		/opt/trinity/share/pixmaps
+debian/icons/ksnapshot-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegraphics/debian/ksnapshot-trinity.menu b/ubuntu/maverick/tdegraphics/debian/ksnapshot-trinity.menu
index c490d6cf4..b82c77733 100644
--- a/ubuntu/maverick/tdegraphics/debian/ksnapshot-trinity.menu
+++ b/ubuntu/maverick/tdegraphics/debian/ksnapshot-trinity.menu
@@ -3,8 +3,8 @@
 	section="Applications/Graphics"\
 	hints="TDE"\
 	title="KSnapshot"\
-	icon32x32="/usr/share/pixmaps/ksnapshot.xpm"\
-	icon16x16="/usr/share/pixmaps/ksnapshot-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/ksnapshot.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ksnapshot-16.xpm"\
 	command="/opt/trinity/bin/ksnapshot"
 
 # Icon 32x32 ksnapshot/cr32-app-ksnapshot.png ksnapshot.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.install b/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.install
index b1458dc3a..d8f2d8f7e 100644
--- a/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.install
@@ -21,8 +21,8 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kuickshow.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kuickshow.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kuickshow.png
 
-debian/icons/kuickshow.xpm		/usr/share/pixmaps
-debian/icons/kuickshow-16.xpm		/usr/share/pixmaps
+debian/icons/kuickshow.xpm		/opt/trinity/share/pixmaps
+debian/icons/kuickshow-16.xpm		/opt/trinity/share/pixmaps
 
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuickshow/screenshot.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuickshow/common
diff --git a/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.menu b/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.menu
index 3e92e9147..ed69377fb 100644
--- a/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.menu
+++ b/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.menu
@@ -3,8 +3,8 @@
 	section="Applications/Viewers"\
 	hints="TDE"\
 	title="Kuickshow"\
-	icon32x32="/usr/share/pixmaps/kuickshow.xpm"\
-	icon16x16="/usr/share/pixmaps/kuickshow-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kuickshow.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kuickshow-16.xpm"\
 	command="/opt/trinity/bin/kuickshow"
 
 # Icon 32x32 kuickshow/src/cr32-app-kuickshow.png kuickshow.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/kview-trinity.install b/ubuntu/maverick/tdegraphics/debian/kview-trinity.install
index dac3ba875..b8094a7d7 100644
--- a/ubuntu/maverick/tdegraphics/debian/kview-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kview-trinity.install
@@ -62,5 +62,5 @@ debian/tmp/opt/trinity/share/services/photobook.desktop
 debian/tmp/opt/trinity/share/servicetypes/kimageviewer.desktop
 debian/tmp/opt/trinity/share/servicetypes/kimageviewercanvas.desktop
 
-debian/icons/kview.xpm		/usr/share/pixmaps
-debian/icons/kview-16.xpm	/usr/share/pixmaps
+debian/icons/kview.xpm		/opt/trinity/share/pixmaps
+debian/icons/kview-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegraphics/debian/kview-trinity.menu b/ubuntu/maverick/tdegraphics/debian/kview-trinity.menu
index e0779319d..b835f26fc 100644
--- a/ubuntu/maverick/tdegraphics/debian/kview-trinity.menu
+++ b/ubuntu/maverick/tdegraphics/debian/kview-trinity.menu
@@ -3,8 +3,8 @@
 	section="Applications/Viewers"\
 	hints="KDE,Images"\
 	title="KView"\
-	icon32x32="/usr/share/pixmaps/kview.xpm"\
-	icon16x16="/usr/share/pixmaps/kview-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kview.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kview-16.xpm"\
 	command="/opt/trinity/bin/kview"
 
 # Icon 32x32 kview/cr32-app-kview.png kview.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/rules b/ubuntu/maverick/tdegraphics/debian/rules
index 6fc12c5ab..927f3faf8 100755
--- a/ubuntu/maverick/tdegraphics/debian/rules
+++ b/ubuntu/maverick/tdegraphics/debian/rules
@@ -54,65 +54,81 @@ 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/
+	#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/
+	#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/
+	#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/
+	#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/	
+	#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/	
+	#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/kooka-trinity::
-	cp -Rp debian/kooka-trinity/usr/* debian/kooka-trinity/opt/trinity/
-	rm -rf debian/kooka-trinity/usr/
+	#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/
+	#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/
+	#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/
+	#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/
+	#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/
+	#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/
+	#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/
+	#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/
+	#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/
+	#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/