Fix installation of kvirc protocol files on Debian and Ubuntu

This resolves Bug 2497

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 6253ed4f8177cb33fef709fb7e215ff94e6300c1)

9 files changed, 21 insertions, 12 deletions

diff --git a/debian/lenny/applications/kvirc/debian/kvirc-data-trinity.postinst b/debian/lenny/applications/kvirc/debian/kvirc-data-trinity.postinst
index 4b1204c8e..44593aa4f 100644
--- a/debian/lenny/applications/kvirc/debian/kvirc-data-trinity.postinst
+++ b/debian/lenny/applications/kvirc/debian/kvirc-data-trinity.postinst
@@ -6,10 +6,10 @@ case "$1" in
     configure)
         update-alternatives --quiet --install \
             /opt/trinity/share/services/irc.protocol irc.protocol \
-            /opt/trinity/share/kvirc/3.4.0/services/irc.protocol 60
+            /opt/trinity/share/kvirc/3.4/services/irc.protocol 60
         update-alternatives --quiet --install \
             /opt/trinity/share/services/irc6.protocol irc6.protocol \
-            /opt/trinity/share/kvirc/3.4.0/services/irc6.protocol 60
+            /opt/trinity/share/kvirc/3.4/services/irc6.protocol 60
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/lenny/applications/kvirc/debian/kvirc-data-trinity.prerm b/debian/lenny/applications/kvirc/debian/kvirc-data-trinity.prerm
index 5899d25b7..411365f32 100644
--- a/debian/lenny/applications/kvirc/debian/kvirc-data-trinity.prerm
+++ b/debian/lenny/applications/kvirc/debian/kvirc-data-trinity.prerm
@@ -5,9 +5,9 @@ set -e
 case "$1" in
     remove)
         update-alternatives --quiet --remove irc.protocol \
-            /opt/trinity/share/kvirc/3.4.0/services/irc.protocol
+            /opt/trinity/share/kvirc/3.4/services/irc.protocol
         update-alternatives --quiet --remove irc6.protocol \
-            /opt/trinity/share/kvirc/3.4.0/services/irc6.protocol
+            /opt/trinity/share/kvirc/3.4/services/irc6.protocol
     ;;
 
     upgrade|deconfigure)
diff --git a/debian/lenny/applications/kvirc/debian/rules b/debian/lenny/applications/kvirc/debian/rules
index d0de2524f..729103a30 100755
--- a/debian/lenny/applications/kvirc/debian/rules
+++ b/debian/lenny/applications/kvirc/debian/rules
@@ -84,3 +84,6 @@ debian/stamp-bootstrap:
 	./autogen.sh
 	touch debian/stamp-bootstrap
 
+binary-install/kvirc-data-trinity::
+	mkdir -p debian/$(cdbs_curpkg)/opt/trinity/share/kvirc/3.4/services
+	mv debian/tmp/opt/trinity/share/services/* debian/$(cdbs_curpkg)/opt/trinity/share/kvirc/3.4/services/
diff --git a/debian/squeeze/applications/kvirc/debian/kvirc-data-trinity.postinst b/debian/squeeze/applications/kvirc/debian/kvirc-data-trinity.postinst
index 4b1204c8e..44593aa4f 100644
--- a/debian/squeeze/applications/kvirc/debian/kvirc-data-trinity.postinst
+++ b/debian/squeeze/applications/kvirc/debian/kvirc-data-trinity.postinst
@@ -6,10 +6,10 @@ case "$1" in
     configure)
         update-alternatives --quiet --install \
             /opt/trinity/share/services/irc.protocol irc.protocol \
-            /opt/trinity/share/kvirc/3.4.0/services/irc.protocol 60
+            /opt/trinity/share/kvirc/3.4/services/irc.protocol 60
         update-alternatives --quiet --install \
             /opt/trinity/share/services/irc6.protocol irc6.protocol \
-            /opt/trinity/share/kvirc/3.4.0/services/irc6.protocol 60
+            /opt/trinity/share/kvirc/3.4/services/irc6.protocol 60
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/squeeze/applications/kvirc/debian/kvirc-data-trinity.prerm b/debian/squeeze/applications/kvirc/debian/kvirc-data-trinity.prerm
index 5899d25b7..411365f32 100644
--- a/debian/squeeze/applications/kvirc/debian/kvirc-data-trinity.prerm
+++ b/debian/squeeze/applications/kvirc/debian/kvirc-data-trinity.prerm
@@ -5,9 +5,9 @@ set -e
 case "$1" in
     remove)
         update-alternatives --quiet --remove irc.protocol \
-            /opt/trinity/share/kvirc/3.4.0/services/irc.protocol
+            /opt/trinity/share/kvirc/3.4/services/irc.protocol
         update-alternatives --quiet --remove irc6.protocol \
-            /opt/trinity/share/kvirc/3.4.0/services/irc6.protocol
+            /opt/trinity/share/kvirc/3.4/services/irc6.protocol
     ;;
 
     upgrade|deconfigure)
diff --git a/debian/squeeze/applications/kvirc/debian/rules b/debian/squeeze/applications/kvirc/debian/rules
index 4cacf15a9..6fe6c435f 100755
--- a/debian/squeeze/applications/kvirc/debian/rules
+++ b/debian/squeeze/applications/kvirc/debian/rules
@@ -84,3 +84,6 @@ debian/stamp-bootstrap:
 	./autogen.sh
 	touch debian/stamp-bootstrap
 
+binary-install/kvirc-data-trinity::
+	mkdir -p debian/$(cdbs_curpkg)/opt/trinity/share/kvirc/3.4/services
+	mv debian/tmp/opt/trinity/share/services/* debian/$(cdbs_curpkg)/opt/trinity/share/kvirc/3.4/services/
diff --git a/ubuntu/maverick/applications/kvirc/debian/kvirc-data-trinity.postinst b/ubuntu/maverick/applications/kvirc/debian/kvirc-data-trinity.postinst
index 4b1204c8e..44593aa4f 100644
--- a/ubuntu/maverick/applications/kvirc/debian/kvirc-data-trinity.postinst
+++ b/ubuntu/maverick/applications/kvirc/debian/kvirc-data-trinity.postinst
@@ -6,10 +6,10 @@ case "$1" in
     configure)
         update-alternatives --quiet --install \
             /opt/trinity/share/services/irc.protocol irc.protocol \
-            /opt/trinity/share/kvirc/3.4.0/services/irc.protocol 60
+            /opt/trinity/share/kvirc/3.4/services/irc.protocol 60
         update-alternatives --quiet --install \
             /opt/trinity/share/services/irc6.protocol irc6.protocol \
-            /opt/trinity/share/kvirc/3.4.0/services/irc6.protocol 60
+            /opt/trinity/share/kvirc/3.4/services/irc6.protocol 60
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/ubuntu/maverick/applications/kvirc/debian/kvirc-data-trinity.prerm b/ubuntu/maverick/applications/kvirc/debian/kvirc-data-trinity.prerm
index 5899d25b7..411365f32 100644
--- a/ubuntu/maverick/applications/kvirc/debian/kvirc-data-trinity.prerm
+++ b/ubuntu/maverick/applications/kvirc/debian/kvirc-data-trinity.prerm
@@ -5,9 +5,9 @@ set -e
 case "$1" in
     remove)
         update-alternatives --quiet --remove irc.protocol \
-            /opt/trinity/share/kvirc/3.4.0/services/irc.protocol
+            /opt/trinity/share/kvirc/3.4/services/irc.protocol
         update-alternatives --quiet --remove irc6.protocol \
-            /opt/trinity/share/kvirc/3.4.0/services/irc6.protocol
+            /opt/trinity/share/kvirc/3.4/services/irc6.protocol
     ;;
 
     upgrade|deconfigure)
diff --git a/ubuntu/maverick/applications/kvirc/debian/rules b/ubuntu/maverick/applications/kvirc/debian/rules
index 4cacf15a9..6fe6c435f 100755
--- a/ubuntu/maverick/applications/kvirc/debian/rules
+++ b/ubuntu/maverick/applications/kvirc/debian/rules
@@ -84,3 +84,6 @@ debian/stamp-bootstrap:
 	./autogen.sh
 	touch debian/stamp-bootstrap
 
+binary-install/kvirc-data-trinity::
+	mkdir -p debian/$(cdbs_curpkg)/opt/trinity/share/kvirc/3.4/services
+	mv debian/tmp/opt/trinity/share/services/* debian/$(cdbs_curpkg)/opt/trinity/share/kvirc/3.4/services/