Fix alternatives provision on Debian and Ubuntu

This resolves Bug 2452

Signed-off-by: Nick Leverton <nick@leverton.org>

21 files changed, 30 insertions, 21 deletions

diff --git a/debian/lenny/tdebase/debian/konqueror-trinity.postinst b/debian/lenny/tdebase/debian/konqueror-trinity.postinst
index ea83963d9..4c62f6bf2 100644
--- a/debian/lenny/tdebase/debian/konqueror-trinity.postinst
+++ b/debian/lenny/tdebase/debian/konqueror-trinity.postinst
@@ -24,6 +24,9 @@ case "$1" in
         divert_remove /usr/share/icons/hicolor/48x48/apps/konqueror.png
         divert_remove /usr/share/icons/hicolor/64x64/apps/konqueror.png
         divert_remove /usr/share/icons/hicolor/scalable/apps/konqueror.svgz
+
+        update-alternatives --install /usr/bin/x-www-browser x-www-browser /opt/trinity/bin/konqueror 100 \
+          --slave /usr/share/man/man1/x-www-browser.1.gz x-www-browser.1.gz /usr/share/man/man1/konqueror-trinity.1.gz
     ;;
 
     install)
diff --git a/debian/lenny/tdebase/debian/konqueror-trinity.prerm b/debian/lenny/tdebase/debian/konqueror-trinity.prerm
index 73baa81cc..57b10d0a5 100644
--- a/debian/lenny/tdebase/debian/konqueror-trinity.prerm
+++ b/debian/lenny/tdebase/debian/konqueror-trinity.prerm
@@ -2,7 +2,7 @@
 
 case "$1" in
     remove)
-        /usr/sbin/update-alternatives --remove x-www-browser /usr/trinity/bin/konqueror
+        /usr/sbin/update-alternatives --remove x-www-browser /opt/trinity/bin/konqueror
     ;;
 
     upgrade|deconfigure)
diff --git a/debian/lenny/tdebase/debian/konsole-trinity.postinst b/debian/lenny/tdebase/debian/konsole-trinity.postinst
index d7225354d..d8be0590f 100644
--- a/debian/lenny/tdebase/debian/konsole-trinity.postinst
+++ b/debian/lenny/tdebase/debian/konsole-trinity.postinst
@@ -20,7 +20,7 @@ set -e
 case "$1" in
     configure)
         update-alternatives --install /usr/bin/x-terminal-emulator x-terminal-emulator /opt/trinity/bin/konsole 35 \
-          --slave /opt/trinity/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz /opt/trinity/share/man/man1/konsole-trinity.1.gz
+          --slave /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz /usr/share/man/man1/konsole-trinity.1.gz
 
         # force ldconfig due to tdeinit library
         ldconfig
diff --git a/debian/lenny/tdebase/debian/konsole-trinity.prerm b/debian/lenny/tdebase/debian/konsole-trinity.prerm
index 08074f5f3..041265da8 100644
--- a/debian/lenny/tdebase/debian/konsole-trinity.prerm
+++ b/debian/lenny/tdebase/debian/konsole-trinity.prerm
@@ -19,7 +19,7 @@ set -e
 
 case "$1" in
     remove)
-        /usr/sbin/update-alternatives --remove x-terminal-emulator /usr/trinity/bin/konsole
+        /usr/sbin/update-alternatives --remove x-terminal-emulator /opt/trinity/bin/konsole
     ;;
 
     upgrade|deconfigure)
diff --git a/debian/lenny/tdebase/debian/ksmserver-trinity.postinst b/debian/lenny/tdebase/debian/ksmserver-trinity.postinst
index eee248305..7983daa09 100644
--- a/debian/lenny/tdebase/debian/ksmserver-trinity.postinst
+++ b/debian/lenny/tdebase/debian/ksmserver-trinity.postinst
@@ -21,8 +21,8 @@ case "$1" in
     configure)
         update-alternatives --install /usr/bin/x-session-manager \
 	x-session-manager /opt/trinity/bin/starttde 40 \
-	--slave /opt/trinity/share/man/man1/x-session-manager.1.gz \
-	x-session-manager.1.gz "/opt/trinity/share/man/man1/starttde-trinity.1.gz"
+	--slave /usr/share/man/man1/x-session-manager.1.gz \
+	x-session-manager.1.gz "/usr/share/man/man1/starttde-trinity.1.gz"
 
         # force ldconfig due to tdeinit library
         ldconfig
diff --git a/debian/lenny/tdebase/debian/ksmserver-trinity.prerm b/debian/lenny/tdebase/debian/ksmserver-trinity.prerm
index a885c6d4c..87b7dcbfe 100644
--- a/debian/lenny/tdebase/debian/ksmserver-trinity.prerm
+++ b/debian/lenny/tdebase/debian/ksmserver-trinity.prerm
@@ -19,7 +19,7 @@ set -e
 
 case "$1" in
     remove)
-        /usr/sbin/update-alternatives --remove x-session-manager /usr/trinity/bin/starttde
+        /usr/sbin/update-alternatives --remove x-session-manager /opt/trinity/bin/starttde
     ;;
 
     upgrade|deconfigure)
diff --git a/debian/lenny/tdebase/debian/twin-trinity.prerm b/debian/lenny/tdebase/debian/twin-trinity.prerm
index 67c4b2507..28c98ad19 100644
--- a/debian/lenny/tdebase/debian/twin-trinity.prerm
+++ b/debian/lenny/tdebase/debian/twin-trinity.prerm
@@ -19,7 +19,7 @@ set -e
 
 case "$1" in
     remove)
-        /usr/sbin/update-alternatives --remove x-window-manager /usr/trinity/bin/twin
+        /usr/sbin/update-alternatives --remove x-window-manager /opt/trinity/bin/twin
     ;;
 
     upgrade|deconfigure)
diff --git a/debian/squeeze/tdebase/debian/konqueror-trinity.postinst b/debian/squeeze/tdebase/debian/konqueror-trinity.postinst
index ea83963d9..4c62f6bf2 100644
--- a/debian/squeeze/tdebase/debian/konqueror-trinity.postinst
+++ b/debian/squeeze/tdebase/debian/konqueror-trinity.postinst
@@ -24,6 +24,9 @@ case "$1" in
         divert_remove /usr/share/icons/hicolor/48x48/apps/konqueror.png
         divert_remove /usr/share/icons/hicolor/64x64/apps/konqueror.png
         divert_remove /usr/share/icons/hicolor/scalable/apps/konqueror.svgz
+
+        update-alternatives --install /usr/bin/x-www-browser x-www-browser /opt/trinity/bin/konqueror 100 \
+          --slave /usr/share/man/man1/x-www-browser.1.gz x-www-browser.1.gz /usr/share/man/man1/konqueror-trinity.1.gz
     ;;
 
     install)
diff --git a/debian/squeeze/tdebase/debian/konqueror-trinity.prerm b/debian/squeeze/tdebase/debian/konqueror-trinity.prerm
index 73baa81cc..57b10d0a5 100644
--- a/debian/squeeze/tdebase/debian/konqueror-trinity.prerm
+++ b/debian/squeeze/tdebase/debian/konqueror-trinity.prerm
@@ -2,7 +2,7 @@
 
 case "$1" in
     remove)
-        /usr/sbin/update-alternatives --remove x-www-browser /usr/trinity/bin/konqueror
+        /usr/sbin/update-alternatives --remove x-www-browser /opt/trinity/bin/konqueror
     ;;
 
     upgrade|deconfigure)
diff --git a/debian/squeeze/tdebase/debian/konsole-trinity.postinst b/debian/squeeze/tdebase/debian/konsole-trinity.postinst
index d7225354d..d8be0590f 100644
--- a/debian/squeeze/tdebase/debian/konsole-trinity.postinst
+++ b/debian/squeeze/tdebase/debian/konsole-trinity.postinst
@@ -20,7 +20,7 @@ set -e
 case "$1" in
     configure)
         update-alternatives --install /usr/bin/x-terminal-emulator x-terminal-emulator /opt/trinity/bin/konsole 35 \
-          --slave /opt/trinity/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz /opt/trinity/share/man/man1/konsole-trinity.1.gz
+          --slave /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz /usr/share/man/man1/konsole-trinity.1.gz
 
         # force ldconfig due to tdeinit library
         ldconfig
diff --git a/debian/squeeze/tdebase/debian/konsole-trinity.prerm b/debian/squeeze/tdebase/debian/konsole-trinity.prerm
index 08074f5f3..041265da8 100644
--- a/debian/squeeze/tdebase/debian/konsole-trinity.prerm
+++ b/debian/squeeze/tdebase/debian/konsole-trinity.prerm
@@ -19,7 +19,7 @@ set -e
 
 case "$1" in
     remove)
-        /usr/sbin/update-alternatives --remove x-terminal-emulator /usr/trinity/bin/konsole
+        /usr/sbin/update-alternatives --remove x-terminal-emulator /opt/trinity/bin/konsole
     ;;
 
     upgrade|deconfigure)
diff --git a/debian/squeeze/tdebase/debian/ksmserver-trinity.postinst b/debian/squeeze/tdebase/debian/ksmserver-trinity.postinst
index eee248305..7983daa09 100644
--- a/debian/squeeze/tdebase/debian/ksmserver-trinity.postinst
+++ b/debian/squeeze/tdebase/debian/ksmserver-trinity.postinst
@@ -21,8 +21,8 @@ case "$1" in
     configure)
         update-alternatives --install /usr/bin/x-session-manager \
 	x-session-manager /opt/trinity/bin/starttde 40 \
-	--slave /opt/trinity/share/man/man1/x-session-manager.1.gz \
-	x-session-manager.1.gz "/opt/trinity/share/man/man1/starttde-trinity.1.gz"
+	--slave /usr/share/man/man1/x-session-manager.1.gz \
+	x-session-manager.1.gz "/usr/share/man/man1/starttde-trinity.1.gz"
 
         # force ldconfig due to tdeinit library
         ldconfig
diff --git a/debian/squeeze/tdebase/debian/ksmserver-trinity.prerm b/debian/squeeze/tdebase/debian/ksmserver-trinity.prerm
index a885c6d4c..87b7dcbfe 100644
--- a/debian/squeeze/tdebase/debian/ksmserver-trinity.prerm
+++ b/debian/squeeze/tdebase/debian/ksmserver-trinity.prerm
@@ -19,7 +19,7 @@ set -e
 
 case "$1" in
     remove)
-        /usr/sbin/update-alternatives --remove x-session-manager /usr/trinity/bin/starttde
+        /usr/sbin/update-alternatives --remove x-session-manager /opt/trinity/bin/starttde
     ;;
 
     upgrade|deconfigure)
diff --git a/debian/squeeze/tdebase/debian/twin-trinity.prerm b/debian/squeeze/tdebase/debian/twin-trinity.prerm
index 67c4b2507..28c98ad19 100644
--- a/debian/squeeze/tdebase/debian/twin-trinity.prerm
+++ b/debian/squeeze/tdebase/debian/twin-trinity.prerm
@@ -19,7 +19,7 @@ set -e
 
 case "$1" in
     remove)
-        /usr/sbin/update-alternatives --remove x-window-manager /usr/trinity/bin/twin
+        /usr/sbin/update-alternatives --remove x-window-manager /opt/trinity/bin/twin
     ;;
 
     upgrade|deconfigure)
diff --git a/ubuntu/maverick/tdebase/debian/konqueror-trinity.postinst b/ubuntu/maverick/tdebase/debian/konqueror-trinity.postinst
index ea83963d9..4c62f6bf2 100644
--- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.postinst
+++ b/ubuntu/maverick/tdebase/debian/konqueror-trinity.postinst
@@ -24,6 +24,9 @@ case "$1" in
         divert_remove /usr/share/icons/hicolor/48x48/apps/konqueror.png
         divert_remove /usr/share/icons/hicolor/64x64/apps/konqueror.png
         divert_remove /usr/share/icons/hicolor/scalable/apps/konqueror.svgz
+
+        update-alternatives --install /usr/bin/x-www-browser x-www-browser /opt/trinity/bin/konqueror 100 \
+          --slave /usr/share/man/man1/x-www-browser.1.gz x-www-browser.1.gz /usr/share/man/man1/konqueror-trinity.1.gz
     ;;
 
     install)
diff --git a/ubuntu/maverick/tdebase/debian/konqueror-trinity.prerm b/ubuntu/maverick/tdebase/debian/konqueror-trinity.prerm
index 73baa81cc..57b10d0a5 100644
--- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.prerm
+++ b/ubuntu/maverick/tdebase/debian/konqueror-trinity.prerm
@@ -2,7 +2,7 @@
 
 case "$1" in
     remove)
-        /usr/sbin/update-alternatives --remove x-www-browser /usr/trinity/bin/konqueror
+        /usr/sbin/update-alternatives --remove x-www-browser /opt/trinity/bin/konqueror
     ;;
 
     upgrade|deconfigure)
diff --git a/ubuntu/maverick/tdebase/debian/konsole-trinity.postinst b/ubuntu/maverick/tdebase/debian/konsole-trinity.postinst
index d7225354d..d8be0590f 100644
--- a/ubuntu/maverick/tdebase/debian/konsole-trinity.postinst
+++ b/ubuntu/maverick/tdebase/debian/konsole-trinity.postinst
@@ -20,7 +20,7 @@ set -e
 case "$1" in
     configure)
         update-alternatives --install /usr/bin/x-terminal-emulator x-terminal-emulator /opt/trinity/bin/konsole 35 \
-          --slave /opt/trinity/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz /opt/trinity/share/man/man1/konsole-trinity.1.gz
+          --slave /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz /usr/share/man/man1/konsole-trinity.1.gz
 
         # force ldconfig due to tdeinit library
         ldconfig
diff --git a/ubuntu/maverick/tdebase/debian/konsole-trinity.prerm b/ubuntu/maverick/tdebase/debian/konsole-trinity.prerm
index 08074f5f3..041265da8 100644
--- a/ubuntu/maverick/tdebase/debian/konsole-trinity.prerm
+++ b/ubuntu/maverick/tdebase/debian/konsole-trinity.prerm
@@ -19,7 +19,7 @@ set -e
 
 case "$1" in
     remove)
-        /usr/sbin/update-alternatives --remove x-terminal-emulator /usr/trinity/bin/konsole
+        /usr/sbin/update-alternatives --remove x-terminal-emulator /opt/trinity/bin/konsole
     ;;
 
     upgrade|deconfigure)
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst
index eee248305..7983daa09 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst
+++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst
@@ -21,8 +21,8 @@ case "$1" in
     configure)
         update-alternatives --install /usr/bin/x-session-manager \
 	x-session-manager /opt/trinity/bin/starttde 40 \
-	--slave /opt/trinity/share/man/man1/x-session-manager.1.gz \
-	x-session-manager.1.gz "/opt/trinity/share/man/man1/starttde-trinity.1.gz"
+	--slave /usr/share/man/man1/x-session-manager.1.gz \
+	x-session-manager.1.gz "/usr/share/man/man1/starttde-trinity.1.gz"
 
         # force ldconfig due to tdeinit library
         ldconfig
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm
index a885c6d4c..87b7dcbfe 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm
+++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm
@@ -19,7 +19,7 @@ set -e
 
 case "$1" in
     remove)
-        /usr/sbin/update-alternatives --remove x-session-manager /usr/trinity/bin/starttde
+        /usr/sbin/update-alternatives --remove x-session-manager /opt/trinity/bin/starttde
     ;;
 
     upgrade|deconfigure)
diff --git a/ubuntu/maverick/tdebase/debian/twin-trinity.prerm b/ubuntu/maverick/tdebase/debian/twin-trinity.prerm
index 67c4b2507..28c98ad19 100644
--- a/ubuntu/maverick/tdebase/debian/twin-trinity.prerm
+++ b/ubuntu/maverick/tdebase/debian/twin-trinity.prerm
@@ -19,7 +19,7 @@ set -e
 
 case "$1" in
     remove)
-        /usr/sbin/update-alternatives --remove x-window-manager /usr/trinity/bin/twin
+        /usr/sbin/update-alternatives --remove x-window-manager /opt/trinity/bin/twin
     ;;
 
     upgrade|deconfigure)