From cef2b1afa1d1e5432d4476b9763333207b7a9c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 5 Jul 2015 20:42:22 +0200 Subject: [PATCH] Fix irc.protocol alternatives provision on Debian and Ubuntu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit cfdbd6d2a873f55f15c62c6c47e7117cecc3c239) --- .../kvirc/debian/kvirc-data-trinity.postinst | 12 ++++++------ .../kvirc/debian/kvirc-data-trinity.prerm | 8 ++++---- .../lenny/tdenetwork/debian/kopete-trinity.postinst | 2 +- .../kvirc/debian/kvirc-data-trinity.postinst | 12 ++++++------ .../kvirc/debian/kvirc-data-trinity.prerm | 8 ++++---- .../tdenetwork/debian/kopete-trinity.postinst | 2 +- .../kvirc/debian/kvirc-data-trinity.postinst | 12 ++++++------ .../kvirc/debian/kvirc-data-trinity.prerm | 8 ++++---- .../tdenetwork/debian/kopete-trinity.postinst | 2 +- 9 files changed, 33 insertions(+), 33 deletions(-) diff --git a/debian/lenny/applications/kvirc/debian/kvirc-data-trinity.postinst b/debian/lenny/applications/kvirc/debian/kvirc-data-trinity.postinst index ae66752f1..4b1204c8e 100644 --- a/debian/lenny/applications/kvirc/debian/kvirc-data-trinity.postinst +++ b/debian/lenny/applications/kvirc/debian/kvirc-data-trinity.postinst @@ -4,12 +4,12 @@ set -e case "$1" in configure) -# update-alternatives --quiet --install \ -# /usr/share/services/irc.protocol irc.protocol \ -# /opt/trinity/share/kvirc/3.4.0/services/irc.protocol 60 -# update-alternatives --quiet --install \ -# /usr/share/services/irc6.protocol irc6.protocol \ -# /opt/trinity/share/kvirc/3.4.0/services/irc6.protocol 60 + update-alternatives --quiet --install \ + /opt/trinity/share/services/irc.protocol irc.protocol \ + /opt/trinity/share/kvirc/3.4.0/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 ;; 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 4efb6507f..5899d25b7 100644 --- a/debian/lenny/applications/kvirc/debian/kvirc-data-trinity.prerm +++ b/debian/lenny/applications/kvirc/debian/kvirc-data-trinity.prerm @@ -4,10 +4,10 @@ set -e case "$1" in remove) -# update-alternatives --quiet --remove irc.protocol \ -# /opt/trinity/share/kvirc/3.4.0/services/irc.protocol -# update-alternatives --quiet --remove irc6.protocol \ -# /opt/trinity/share/kvirc/3.4.0/services/irc6.protocol + update-alternatives --quiet --remove irc.protocol \ + /opt/trinity/share/kvirc/3.4.0/services/irc.protocol + update-alternatives --quiet --remove irc6.protocol \ + /opt/trinity/share/kvirc/3.4.0/services/irc6.protocol ;; upgrade|deconfigure) diff --git a/debian/lenny/tdenetwork/debian/kopete-trinity.postinst b/debian/lenny/tdenetwork/debian/kopete-trinity.postinst index 4ccb5ac4c..f1f83b298 100644 --- a/debian/lenny/tdenetwork/debian/kopete-trinity.postinst +++ b/debian/lenny/tdenetwork/debian/kopete-trinity.postinst @@ -20,7 +20,7 @@ set -e case "$1" in configure) update-alternatives --auto irc.protocol || true - update-alternatives --verbose --install /usr/share/services/irc.protocol irc.protocol /opt/trinity/share/apps/kopete/irc.protocol 40 || true + update-alternatives --verbose --install /opt/trinity/share/services/irc.protocol irc.protocol /opt/trinity/share/apps/kopete/irc.protocol 40 || true ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/squeeze/applications/kvirc/debian/kvirc-data-trinity.postinst b/debian/squeeze/applications/kvirc/debian/kvirc-data-trinity.postinst index ae66752f1..4b1204c8e 100644 --- a/debian/squeeze/applications/kvirc/debian/kvirc-data-trinity.postinst +++ b/debian/squeeze/applications/kvirc/debian/kvirc-data-trinity.postinst @@ -4,12 +4,12 @@ set -e case "$1" in configure) -# update-alternatives --quiet --install \ -# /usr/share/services/irc.protocol irc.protocol \ -# /opt/trinity/share/kvirc/3.4.0/services/irc.protocol 60 -# update-alternatives --quiet --install \ -# /usr/share/services/irc6.protocol irc6.protocol \ -# /opt/trinity/share/kvirc/3.4.0/services/irc6.protocol 60 + update-alternatives --quiet --install \ + /opt/trinity/share/services/irc.protocol irc.protocol \ + /opt/trinity/share/kvirc/3.4.0/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 ;; 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 4efb6507f..5899d25b7 100644 --- a/debian/squeeze/applications/kvirc/debian/kvirc-data-trinity.prerm +++ b/debian/squeeze/applications/kvirc/debian/kvirc-data-trinity.prerm @@ -4,10 +4,10 @@ set -e case "$1" in remove) -# update-alternatives --quiet --remove irc.protocol \ -# /opt/trinity/share/kvirc/3.4.0/services/irc.protocol -# update-alternatives --quiet --remove irc6.protocol \ -# /opt/trinity/share/kvirc/3.4.0/services/irc6.protocol + update-alternatives --quiet --remove irc.protocol \ + /opt/trinity/share/kvirc/3.4.0/services/irc.protocol + update-alternatives --quiet --remove irc6.protocol \ + /opt/trinity/share/kvirc/3.4.0/services/irc6.protocol ;; upgrade|deconfigure) diff --git a/debian/squeeze/tdenetwork/debian/kopete-trinity.postinst b/debian/squeeze/tdenetwork/debian/kopete-trinity.postinst index 4ccb5ac4c..f1f83b298 100644 --- a/debian/squeeze/tdenetwork/debian/kopete-trinity.postinst +++ b/debian/squeeze/tdenetwork/debian/kopete-trinity.postinst @@ -20,7 +20,7 @@ set -e case "$1" in configure) update-alternatives --auto irc.protocol || true - update-alternatives --verbose --install /usr/share/services/irc.protocol irc.protocol /opt/trinity/share/apps/kopete/irc.protocol 40 || true + update-alternatives --verbose --install /opt/trinity/share/services/irc.protocol irc.protocol /opt/trinity/share/apps/kopete/irc.protocol 40 || true ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/ubuntu/maverick/applications/kvirc/debian/kvirc-data-trinity.postinst b/ubuntu/maverick/applications/kvirc/debian/kvirc-data-trinity.postinst index ae66752f1..4b1204c8e 100644 --- a/ubuntu/maverick/applications/kvirc/debian/kvirc-data-trinity.postinst +++ b/ubuntu/maverick/applications/kvirc/debian/kvirc-data-trinity.postinst @@ -4,12 +4,12 @@ set -e case "$1" in configure) -# update-alternatives --quiet --install \ -# /usr/share/services/irc.protocol irc.protocol \ -# /opt/trinity/share/kvirc/3.4.0/services/irc.protocol 60 -# update-alternatives --quiet --install \ -# /usr/share/services/irc6.protocol irc6.protocol \ -# /opt/trinity/share/kvirc/3.4.0/services/irc6.protocol 60 + update-alternatives --quiet --install \ + /opt/trinity/share/services/irc.protocol irc.protocol \ + /opt/trinity/share/kvirc/3.4.0/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 ;; 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 4efb6507f..5899d25b7 100644 --- a/ubuntu/maverick/applications/kvirc/debian/kvirc-data-trinity.prerm +++ b/ubuntu/maverick/applications/kvirc/debian/kvirc-data-trinity.prerm @@ -4,10 +4,10 @@ set -e case "$1" in remove) -# update-alternatives --quiet --remove irc.protocol \ -# /opt/trinity/share/kvirc/3.4.0/services/irc.protocol -# update-alternatives --quiet --remove irc6.protocol \ -# /opt/trinity/share/kvirc/3.4.0/services/irc6.protocol + update-alternatives --quiet --remove irc.protocol \ + /opt/trinity/share/kvirc/3.4.0/services/irc.protocol + update-alternatives --quiet --remove irc6.protocol \ + /opt/trinity/share/kvirc/3.4.0/services/irc6.protocol ;; upgrade|deconfigure) diff --git a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.postinst b/ubuntu/maverick/tdenetwork/debian/kopete-trinity.postinst index 4ccb5ac4c..f1f83b298 100644 --- a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.postinst +++ b/ubuntu/maverick/tdenetwork/debian/kopete-trinity.postinst @@ -20,7 +20,7 @@ set -e case "$1" in configure) update-alternatives --auto irc.protocol || true - update-alternatives --verbose --install /usr/share/services/irc.protocol irc.protocol /opt/trinity/share/apps/kopete/irc.protocol 40 || true + update-alternatives --verbose --install /opt/trinity/share/services/irc.protocol irc.protocol /opt/trinity/share/apps/kopete/irc.protocol 40 || true ;; abort-upgrade|abort-remove|abort-deconfigure)