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

15 files changed, 38 insertions, 38 deletions

diff --git a/ubuntu/raring/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
index a4e1eaef5..df08f2d37 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/raring/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
@@ -75,11 +75,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
 	if test -e debian/$(cdbs_curpkg).lintian; then \
 		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \
+			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
 	fi
 	if test -e debian/$(cdbs_curpkg).presubj; then \
 		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \
+			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
 	fi
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
diff --git a/ubuntu/raring/kdegraphics.automake/debian/kcoloredit-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kcoloredit-trinity.menu
index 73907fedd..24dc70519 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kcoloredit-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/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/raring/kdegraphics.automake/debian/kdvi-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kdvi-trinity.menu
index fd6a7d3be..f1bfa96a5 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kdvi-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/debian/kdvi-trinity.menu
@@ -1,10 +1,10 @@
 ?package(kdvi):\
 	needs="X11"\
 	section="Applications/Viewers"\
-	hints="KDE,DVI,Documents"\
+	hints="TDE,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/raring/kdegraphics.automake/debian/kfax-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kfax-trinity.menu
index 344e227f7..810a67ff6 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kfax-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/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/raring/kdegraphics.automake/debian/kfaxview-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kfaxview-trinity.menu
index edc02c8d2..a44fcd5a1 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kfaxview-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/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/raring/kdegraphics.automake/debian/kghostview-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kghostview-trinity.menu
index 70467d3f7..cd27c5660 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kghostview-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/debian/kghostview-trinity.menu
@@ -1,10 +1,10 @@
 ?package(kghostview):\
 	needs="X11"\
 	section="Applications/Viewers"\
-	hints="KDE,Documents"\
+	hints="TDE,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/raring/kdegraphics.automake/debian/kiconedit-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kiconedit-trinity.menu
index e8a17b104..7fb1d2a3b 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kiconedit-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/debian/kiconedit-trinity.menu
@@ -3,8 +3,8 @@
 	section="Applications/Graphics"\
 	hints="TDE"\
 	title="TDEIconEdit"\
-	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/raring/kdegraphics.automake/debian/kolourpaint-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kolourpaint-trinity.menu
index 53e88edba..9372e79f3 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kolourpaint-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/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/raring/kdegraphics.automake/debian/kooka-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kooka-trinity.menu
index 63fcecea8..e922d7a70 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kooka-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/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/raring/kdegraphics.automake/debian/kpdf-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kpdf-trinity.menu
index 971b89101..da324176a 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kpdf-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/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/raring/kdegraphics.automake/debian/kpovmodeler-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kpovmodeler-trinity.menu
index 2ac1d39a7..3287726f7 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kpovmodeler-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/debian/kpovmodeler-trinity.menu
@@ -1,10 +1,10 @@
 ?package(kpovmodeler):\
 	needs="X11"\
 	section="Applications/Graphics"\
-	hints="KDE,Modeler"\
+	hints="TDE,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/raring/kdegraphics.automake/debian/kruler-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kruler-trinity.menu
index 0f1e9c2c1..906bcae11 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kruler-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/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/raring/kdegraphics.automake/debian/ksnapshot-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/ksnapshot-trinity.menu
index c490d6cf4..b82c77733 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/ksnapshot-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/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/raring/kdegraphics.automake/debian/kuickshow-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kuickshow-trinity.menu
index 3e92e9147..ed69377fb 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kuickshow-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/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/raring/kdegraphics.automake/debian/kview-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kview-trinity.menu
index e0779319d..e40a31e43 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kview-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/debian/kview-trinity.menu
@@ -1,10 +1,10 @@
 ?package(kview):\
 	needs="X11"\
 	section="Applications/Viewers"\
-	hints="KDE,Images"\
+	hints="TDE,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