[qgis] 01/03: Remove obsolete diversions in postinst & prerm. (closes: #836993)

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository qgis.

commit 5ff5f3e7f0732e149aa2bf12427eb991ba60ad05
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Sep 11 13:04:19 2016 +0200

    Remove obsolete diversions in postinst & prerm. (closes: #836993)
---
 debian/changelog                     | 7 +++++++
 debian/qgis.postinst                 | 2 +-
 debian/{qgis.postinst => qgis.prerm} | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0b16960..cecd927 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qgis (2.14.6+dfsg-3) UNRELEASED; urgency=medium
+
+  * Remove obsolete diversions in postinst & prerm.
+    (closes: #836993)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 11 Sep 2016 12:55:10 +0200
+
 qgis (2.14.6+dfsg-2) unstable; urgency=medium
 
   * Move obsolete diversion removal from preinst to postinst.
diff --git a/debian/qgis.postinst b/debian/qgis.postinst
index eb81103..859d2aa 100644
--- a/debian/qgis.postinst
+++ b/debian/qgis.postinst
@@ -2,7 +2,7 @@
 
 set -e
 
-if [ "$1" = "install" -o "$1" = "upgrade" ]; then
+if [ "$1" = "configure" ]; then
 	# Remove obsolete diversions
 	for i in /usr/bin/qgis /usr/bin/qbrowser; do
 		pkg=$(dpkg-divert --listpackage $i)
diff --git a/debian/qgis.postinst b/debian/qgis.prerm
similarity index 85%
copy from debian/qgis.postinst
copy to debian/qgis.prerm
index eb81103..3d3f8cf 100644
--- a/debian/qgis.postinst
+++ b/debian/qgis.prerm
@@ -2,7 +2,7 @@
 
 set -e
 
-if [ "$1" = "install" -o "$1" = "upgrade" ]; then
+if [ "$1" = "remove" -o "$1" = "upgrade" ]; then
 	# Remove obsolete diversions
 	for i in /usr/bin/qgis /usr/bin/qbrowser; do
 		pkg=$(dpkg-divert --listpackage $i)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git