Fix install directories for tellico on Debian and Ubuntu

(cherry picked from commit 5f25004554ff0f9b6c513d27bc979ebc59c5be71)

6 files changed, 12 insertions, 3 deletions

diff --git a/debian/lenny/applications/tellico/debian/menu b/debian/lenny/applications/tellico/debian/menu
index 32d337d80..430884153 100644
--- a/debian/lenny/applications/tellico/debian/menu
+++ b/debian/lenny/applications/tellico/debian/menu
@@ -1,5 +1,5 @@
 ?package(tellico):needs="X11"\
   section="Applications/Office"\
   title="Tellico"\
-  icon="/usr/share/pixmaps/tellico.xpm"\
+  icon="/opt/trinity/share/pixmaps/tellico.xpm"\
   command="/opt/trinity/bin/tellico"
diff --git a/debian/lenny/applications/tellico/debian/rules b/debian/lenny/applications/tellico/debian/rules
index cbc398e65..eb8dfa1d5 100755
--- a/debian/lenny/applications/tellico/debian/rules
+++ b/debian/lenny/applications/tellico/debian/rules
@@ -138,6 +138,8 @@ binary-indep: build install
 	dh_testroot
 	dh_install -i
 	dh_installmime -ptellico-data
+	mkdir -p debian/tellico-data-trinity/usr/share/mime
+	mv debian/tellico-data-trinity/opt/trinity/share/apps/mime debian/tellico-data-trinity/usr/share/
 	dh_installchangelogs -i ChangeLog
 	dh_icons -i
 	dh_installdocs -i
@@ -160,6 +162,7 @@ binary-arch: build install
 	dh_installmenu
 	dh_desktop -ptellico
 	dh_installman -a debian/tellico.1x
+	mv debian/tellico-trinity/usr/share/man debian/tellico-trinity/opt/trinity/share/
 	dh_link -a
 	dh_strip
 	dh_compress -a
diff --git a/debian/squeeze/applications/tellico/debian/menu b/debian/squeeze/applications/tellico/debian/menu
index 32d337d80..430884153 100644
--- a/debian/squeeze/applications/tellico/debian/menu
+++ b/debian/squeeze/applications/tellico/debian/menu
@@ -1,5 +1,5 @@
 ?package(tellico):needs="X11"\
   section="Applications/Office"\
   title="Tellico"\
-  icon="/usr/share/pixmaps/tellico.xpm"\
+  icon="/opt/trinity/share/pixmaps/tellico.xpm"\
   command="/opt/trinity/bin/tellico"
diff --git a/debian/squeeze/applications/tellico/debian/rules b/debian/squeeze/applications/tellico/debian/rules
index 1cdd4a5d1..d1248ef1d 100755
--- a/debian/squeeze/applications/tellico/debian/rules
+++ b/debian/squeeze/applications/tellico/debian/rules
@@ -138,6 +138,8 @@ binary-indep: build install
 	dh_testroot
 	dh_install -i
 	dh_installmime -ptellico-data
+	mkdir -p debian/tellico-data-trinity/usr/share/mime
+	mv debian/tellico-data-trinity/opt/trinity/share/apps/mime debian/tellico-data-trinity/usr/share/
 	dh_installchangelogs -i ChangeLog
 	dh_icons -i
 	dh_installdocs -i
@@ -160,6 +162,7 @@ binary-arch: build install
 	dh_installmenu
 	dh_desktop -ptellico
 	dh_installman -a debian/tellico.1x
+	mv debian/tellico-trinity/usr/share/man debian/tellico-trinity/opt/trinity/share/
 	dh_link -a
 	dh_strip
 	dh_compress -a
diff --git a/ubuntu/maverick/applications/tellico/debian/menu b/ubuntu/maverick/applications/tellico/debian/menu
index 32d337d80..430884153 100644
--- a/ubuntu/maverick/applications/tellico/debian/menu
+++ b/ubuntu/maverick/applications/tellico/debian/menu
@@ -1,5 +1,5 @@
 ?package(tellico):needs="X11"\
   section="Applications/Office"\
   title="Tellico"\
-  icon="/usr/share/pixmaps/tellico.xpm"\
+  icon="/opt/trinity/share/pixmaps/tellico.xpm"\
   command="/opt/trinity/bin/tellico"
diff --git a/ubuntu/maverick/applications/tellico/debian/rules b/ubuntu/maverick/applications/tellico/debian/rules
index 1cdd4a5d1..d1248ef1d 100755
--- a/ubuntu/maverick/applications/tellico/debian/rules
+++ b/ubuntu/maverick/applications/tellico/debian/rules
@@ -138,6 +138,8 @@ binary-indep: build install
 	dh_testroot
 	dh_install -i
 	dh_installmime -ptellico-data
+	mkdir -p debian/tellico-data-trinity/usr/share/mime
+	mv debian/tellico-data-trinity/opt/trinity/share/apps/mime debian/tellico-data-trinity/usr/share/
 	dh_installchangelogs -i ChangeLog
 	dh_icons -i
 	dh_installdocs -i
@@ -160,6 +162,7 @@ binary-arch: build install
 	dh_installmenu
 	dh_desktop -ptellico
 	dh_installman -a debian/tellico.1x
+	mv debian/tellico-trinity/usr/share/man debian/tellico-trinity/opt/trinity/share/
 	dh_link -a
 	dh_strip
 	dh_compress -a