[gnuplot] 05/09: Better for for #826721

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository gnuplot.

commit 4a020773b53085de371598cc618abd5ee64a6eea
Author: Anton Gladky <gladk at debian.org>
Date:   Wed Jun 8 22:33:25 2016 +0200

    Better for for #826721
---
 debian/gnuplot-nox.postinst | 8 +++-----
 debian/gnuplot-qt.postinst  | 8 +++-----
 debian/gnuplot-x11.postinst | 8 +++-----
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/debian/gnuplot-nox.postinst b/debian/gnuplot-nox.postinst
index 7e728d5..2390277 100644
--- a/debian/gnuplot-nox.postinst
+++ b/debian/gnuplot-nox.postinst
@@ -2,7 +2,9 @@
 
 set -e
 
-if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" != "upgrade" ]; then
+    update-alternatives --remove gnuplot4 /usr/bin/gnuplot4-nox
+
     update-alternatives --install /usr/bin/gnuplot gnuplot /usr/bin/gnuplot-nox 80 \
       --slave /usr/share/man/man1/gnuplot.1.gz gnuplot.1.gz \
       /usr/share/man/man1/gnuplot-nox.1.gz \
@@ -14,8 +16,4 @@ if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
       /usr/share/man/man1/gnuplot-nox.1.gz
 fi
 
-if [ "$1" != "upgrade" ]; then
-    update-alternatives --remove gnuplot4 /usr/bin/gnuplot4-nox
-fi
-
 #DEBHELPER#
diff --git a/debian/gnuplot-qt.postinst b/debian/gnuplot-qt.postinst
index 5e1717d..8af2493 100644
--- a/debian/gnuplot-qt.postinst
+++ b/debian/gnuplot-qt.postinst
@@ -2,7 +2,9 @@
 
 set -e
 
-if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" != "upgrade"]; then
+    update-alternatives --remove gnuplot4 /usr/bin/gnuplot4-qt
+
     update-alternatives --install /usr/bin/gnuplot gnuplot /usr/bin/gnuplot-qt 100 \
       --slave /usr/share/man/man1/gnuplot.1.gz gnuplot.1.gz \
       /usr/share/man/man1/gnuplot-qt.1.gz \
@@ -14,8 +16,4 @@ if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
       /usr/share/man/man1/gnuplot-qt.1.gz
 fi
 
-if [ "$1" != "upgrade" ]; then
-    update-alternatives --remove gnuplot4 /usr/bin/gnuplot4-qt
-fi
-
 #DEBHELPER#
diff --git a/debian/gnuplot-x11.postinst b/debian/gnuplot-x11.postinst
index ab16ea2..6ced090 100644
--- a/debian/gnuplot-x11.postinst
+++ b/debian/gnuplot-x11.postinst
@@ -2,7 +2,9 @@
 
 set -e
 
-if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" != "upgrade"]; then
+    update-alternatives --remove gnuplot4 /usr/bin/gnuplot4-x11
+
     update-alternatives --install /usr/bin/gnuplot gnuplot /usr/bin/gnuplot-x11 90 \
       --slave /usr/share/man/man1/gnuplot.1.gz gnuplot.1.gz \
       /usr/share/man/man1/gnuplot-x11.1.gz \
@@ -14,8 +16,4 @@ if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
       /usr/share/man/man1/gnuplot-x11.1.gz
 fi
 
-if [ "$1" != "upgrade" ]; then
-    update-alternatives --remove gnuplot4 /usr/bin/gnuplot4-x11
-fi
-
 #DEBHELPER#

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gnuplot.git