summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-08-04 02:51:56 +0200
committerSlávek Banko <slavek.banko@axis.cz>2015-08-04 02:52:50 +0200
commit165ddae6973cc9aedb6e946dcac795086ae602fb (patch)
treecb0be0dd4fd4a34a91e0bba6c1142bd73f97ff7a /ubuntu
parent0be9f6f644adda8669b4956209833ffbd28d5f83 (diff)
downloadtde-packaging-165ddae6973cc9aedb6e946dcac795086ae602fb.tar.gz
tde-packaging-165ddae6973cc9aedb6e946dcac795086ae602fb.zip
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)
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/maverick/applications/kvirc/debian/kvirc-data-trinity.postinst4
-rw-r--r--ubuntu/maverick/applications/kvirc/debian/kvirc-data-trinity.prerm4
-rwxr-xr-xubuntu/maverick/applications/kvirc/debian/rules3
3 files changed, 7 insertions, 4 deletions
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/